http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/pom.xml b/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/pom.xml deleted file mode 100644 index 77f6361..0000000 --- a/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/pom.xml +++ /dev/null @@ -1,316 +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-manager-features</artifactId> - <version>4.1.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.stratos.metadata.service.feature</artifactId> - <packaging>pom</packaging> - <name>Apache Stratos - Meta Data Service feature</name> - <description>This feature packs the Meta Data Service of stratos</description> - - <dependencies> - <!--CXF runtime environment--> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-bundle</artifactId> - <version>2.7.6</version> - </dependency> - <dependency> - <groupId>org.apache.cxf.xjcplugins</groupId> - <artifactId>cxf-xjc-dv</artifactId> - <version>2.6.2</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> - </dependency> - <dependency> - <groupId>org.apache.cxf.xjc-utils</groupId> - <artifactId>cxf-xjc-runtime</artifactId> - <version>2.6.2</version> - </dependency> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.7</version> - </dependency> - <dependency> - <groupId>org.apache.cxf.xjcplugins</groupId> - <artifactId>cxf-xjc-ts</artifactId> - <version>2.6.2</version> - </dependency> - <dependency> - <groupId>org.apache.cxf.xjcplugins</groupId> - <artifactId>cxf-xjc-boolean</artifactId> - <version>2.6.2</version> - </dependency> - <dependency> - <groupId>org.apache.cxf.xjcplugins</groupId> - <artifactId>cxf-xjc-bug671</artifactId> - <version>2.6.2</version> - </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - <version>2.5.1</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpasyncclient</artifactId> - <version>4.0-beta3</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.2.5</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>4.2.4</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-nio</artifactId> - <version>4.2.4</version> - </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.0-m10</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.1.13</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - <version>2.1.13</version> - </dependency> - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> - <version>4.2.0</version> - </dependency> - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>stax2-api</artifactId> - <version>3.1.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <version>1.3.4</version> - </dependency> - <dependency> - <groupId>org.apache.neethi</groupId> - <artifactId>neethi</artifactId> - <version>3.0.2</version> - </dependency> - <dependency> - <groupId>org.apache.ws.security</groupId> - <artifactId>wss4j</artifactId> - <version>1.6.11</version> - </dependency> - <dependency> - <groupId>xml-resolver</groupId> - <artifactId>xml-resolver</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.apache.ws.xmlschema</groupId> - <artifactId>xmlschema-core</artifactId> - <version>2.0.3</version> - </dependency> - <dependency> - <groupId>org.apache.santuario</groupId> - <artifactId>xmlsec</artifactId> - <version>1.5.5</version> - </dependency> - <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.3</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <version>3.0.7.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - <version>3.0.7.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>3.0.7.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>3.0.7.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>3.0.7.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - <version>3.0.7.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>3.0.7.RELEASE</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon.webapp.ext</groupId> - <artifactId>carbon-cxf</artifactId> - <version>1.0.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> - <version>${project.version}</version> - </dependency--> - </dependencies> - - <build> - <resources> - <resource> - <directory>${project.build.directory}/runtime/</directory> - </resource> - <resource> - <directory>${project.build.directory}/web-app/</directory> - </resource> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/runtime/cxf</outputDirectory> - <excludeTransitive>true</excludeTransitive> - </configuration> - </execution> - <execution> - <id>pack-REST-webapp</id> - <phase>package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.metadata.service</artifactId> - <version>${project.version}</version> - <type>war</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/web-app/web-app</outputDirectory> - <destFileName>stratosmetadataservice.war</destFileName> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.wso2.maven</groupId> - <artifactId>carbon-p2-plugin</artifactId> - <executions> - <execution> - <id>p2-feature-generation</id> - <phase>package</phase> - <goals> - <goal>p2-feature-gen</goal> - </goals> - <configuration> - <id>org.apache.stratos.metadata.service</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.stub:${project.version}</bundleDef> - </bundles> - <importFeatures> - <importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef> - </importFeatures> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> -</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf ---------------------------------------------------------------------- diff --git a/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf b/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf deleted file mode 100644 index b82f599..0000000 --- a/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,23 +0,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. - -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/cxf,target:${installFolder}/../../../lib/runtimes/cxf,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/web-app/stratosmetadataservice.war,target:${installFolder}/../../deployment/server/webapps/stratosmetadataservice.war,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/tomcat/webapp-classloading.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/tomcat/webapp-classloading-environments.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading-environments.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/tomcat/context.xml,target:${installFolder}/../../conf/tomcat/context.xml,overwrite:true);\ http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/context.xml ---------------------------------------------------------------------- diff --git a/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/context.xml b/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/context.xml deleted file mode 100644 index a85c9af..0000000 --- a/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/context.xml +++ /dev/null @@ -1,36 +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. ---> -<!-- The contents of this file will be loaded for each web application --> -<Context crossContext="true"> - - <!-- Default set of monitored resources --> - - <Loader className="org.wso2.carbon.webapp.mgt.loader.CarbonWebappLoader" loaderClass="org.wso2.carbon.webapp.mgt.loader.CarbonWebappClassLoader"/> - - <!-- Uncomment this to disable session persistence across Tomcat restarts --> - <!-- - <Manager pathname="" /> - --> - - <!-- Uncomment this to enable Comet connection tacking (provides events - on session expiration as well as webapp lifecycle) --> - <!-- - <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" /> - --> - -</Context> http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading-environments.xml ---------------------------------------------------------------------- diff --git a/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading-environments.xml b/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading-environments.xml deleted file mode 100644 index 7e7dd0a..0000000 --- a/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading-environments.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?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/e16acd17/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading.xml ---------------------------------------------------------------------- diff --git a/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading.xml b/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading.xml deleted file mode 100644 index f42616f..0000000 --- a/features/manager/metadataservice/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?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/e16acd17/features/manager/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/pom.xml b/features/manager/pom.xml index 4f71d01..ca19998 100644 --- a/features/manager/pom.xml +++ b/features/manager/pom.xml @@ -37,20 +37,15 @@ <modules> <module>stratos-mgt</module> - <module>common</module> - <!-- - <module>tenant-mgt</module> - --> <module>gapp</module> - <!--module>throttling</module--> - <!--module>usage</module--> <module>deployment</module> <module>status-monitor</module> <module>tenant-activity</module> <module>logging-mgt</module> <module>rest-endpoint/org.apache.stratos.rest.endpoint.feature</module> <module>styles/org.apache.stratos.manager.styles.feature</module> - <module>metadataservice/org.apache.stratos.metadata.service.feature</module> + <module>metadata-service/org.apache.stratos.metadata.service.feature</module> + <module>metadata-service/org.apache.stratos.metadata.client.feature</module> </modules> <properties> http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/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 23af86b..4b99fbf 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 @@ -247,17 +247,6 @@ <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/runtime/cxf</outputDirectory> - <excludeTransitive>true</excludeTransitive> - </configuration> - </execution> - <execution> <id>pack-REST-webapp</id> <phase>package</phase> <goals> http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf ---------------------------------------------------------------------- diff --git a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf index 1681c1a..1249a8a 100644 --- a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf +++ b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf @@ -16,7 +16,6 @@ # under the License. instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/cxf,target:${installFolder}/../../../lib/runtimes/cxf,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/web-app/api.war,target:${installFolder}/../../deployment/server/webapps/api.war,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/tomcat/webapp-classloading.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading.xml,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/tomcat/webapp-classloading-environments.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading-environments.xml,overwrite:true);\ http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/tomcat/webapp-classloading-environments.xml ---------------------------------------------------------------------- diff --git a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/tomcat/webapp-classloading-environments.xml b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/tomcat/webapp-classloading-environments.xml index 7e7dd0a..39c6b98 100644 --- a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/tomcat/webapp-classloading-environments.xml +++ b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/tomcat/webapp-classloading-environments.xml @@ -30,17 +30,14 @@ 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> @@ -64,5 +61,4 @@ <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/e16acd17/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml new file mode 100644 index 0000000..a0f14a1 --- /dev/null +++ b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml @@ -0,0 +1,299 @@ +<?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>mock-iaas-features</artifactId> + <version>4.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>org.apache.stratos.mock.iaas.api.feature</artifactId> + <packaging>pom</packaging> + <name>Apache Stratos - Mock IaaS API Feature</name> + <description>This feature packs mock iaas capability</description> + + <dependencies> + <!--CXF runtime environment--> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-bundle</artifactId> + <version>2.7.6</version> + </dependency> + <dependency> + <groupId>org.apache.cxf.xjcplugins</groupId> + <artifactId>cxf-xjc-dv</artifactId> + <version>2.6.2</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>org.apache.cxf.xjc-utils</groupId> + <artifactId>cxf-xjc-runtime</artifactId> + <version>2.6.2</version> + </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.cxf.xjcplugins</groupId> + <artifactId>cxf-xjc-ts</artifactId> + <version>2.6.2</version> + </dependency> + <dependency> + <groupId>org.apache.cxf.xjcplugins</groupId> + <artifactId>cxf-xjc-boolean</artifactId> + <version>2.6.2</version> + </dependency> + <dependency> + <groupId>org.apache.cxf.xjcplugins</groupId> + <artifactId>cxf-xjc-bug671</artifactId> + <version>2.6.2</version> + </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache-core</artifactId> + <version>2.5.1</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpasyncclient</artifactId> + <version>4.0-beta3</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.2.5</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.2.4</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-nio</artifactId> + <version>4.2.4</version> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>2.0-m10</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.1.13</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <version>2.1.13</version> + </dependency> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + <version>4.2.0</version> + </dependency> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>1.3.4</version> + </dependency> + <dependency> + <groupId>org.apache.neethi</groupId> + <artifactId>neethi</artifactId> + <version>3.0.2</version> + </dependency> + <dependency> + <groupId>org.apache.ws.security</groupId> + <artifactId>wss4j</artifactId> + <version>1.6.11</version> + </dependency> + <dependency> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> + <version>2.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.santuario</groupId> + <artifactId>xmlsec</artifactId> + <version>1.5.5</version> + </dependency> + <dependency> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + <version>1.6.3</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>3.0.7.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + <version>3.0.7.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>3.0.7.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>3.0.7.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>3.0.7.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>3.0.7.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>3.0.7.RELEASE</version> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>${project.build.directory}/runtime/</directory> + </resource> + <resource> + <directory>${project.build.directory}/web-app/</directory> + </resource> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/runtime/cxf</outputDirectory> + <excludeTransitive>true</excludeTransitive> + </configuration> + </execution> + <execution> + <id>pack-REST-webapp</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.mock.iaas.api</artifactId> + <version>${project.version}</version> + <type>war</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/web-app/web-app</outputDirectory> + <destFileName>mock-iaas-api.war</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.wso2.maven</groupId> + <artifactId>carbon-p2-plugin</artifactId> + <executions> + <execution> + <id>p2-feature-generation</id> + <phase>package</phase> + <goals> + <goal>p2-feature-gen</goal> + </goals> + <configuration> + <id>org.apache.stratos.mock.iaas.api</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.mock.iaas:${project.version} + </bundleDef> + </bundles> + <importFeatures> + <importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef> + </importFeatures> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/p2.inf ---------------------------------------------------------------------- diff --git a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/p2.inf b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/p2.inf new file mode 100644 index 0000000..02594c1 --- /dev/null +++ b/features/mock-iaas/org.apache.stratos.mock.iaas.api.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.mock.iaas.api_${feature.version}/web-app/mock-iaas-api.war,target:${installFolder}/../../deployment/server/webapps/mock-iaas-api.war,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.mock.iaas.api_${feature.version}/tomcat/webapp-classloading.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.mock.iaas.api_${feature.version}/tomcat/webapp-classloading-environments.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading-environments.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.mock.iaas.api_${feature.version}/tomcat/context.xml,target:${installFolder}/../../conf/tomcat/context.xml,overwrite:true);\ http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/context.xml ---------------------------------------------------------------------- diff --git a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/context.xml b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/context.xml new file mode 100644 index 0000000..a153e59 --- /dev/null +++ b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/context.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. + --> +<!-- The contents of this file will be loaded for each web application --> +<Context crossContext="true"> + + <!-- Default set of monitored resources --> + + <Loader className="org.wso2.carbon.webapp.mgt.loader.CarbonWebappLoader" loaderClass="org.wso2.carbon.webapp.mgt.loader.CarbonWebappClassLoader"/> + + <!-- Uncomment this to disable session persistence across Tomcat restarts --> + <!-- + <Manager pathname="" /> + --> + + <!-- Uncomment this to enable Comet connection tacking (provides events + on session expiration as well as webapp lifecycle) --> + <!-- + <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" /> + --> +</Context> http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/webapp-classloading-environments.xml ---------------------------------------------------------------------- diff --git a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/webapp-classloading-environments.xml b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/webapp-classloading-environments.xml new file mode 100644 index 0000000..08e07b4 --- /dev/null +++ b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/webapp-classloading-environments.xml @@ -0,0 +1,67 @@ +<?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. + --> + +<!-- + 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/e16acd17/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/webapp-classloading.xml ---------------------------------------------------------------------- diff --git a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/webapp-classloading.xml b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/webapp-classloading.xml new file mode 100644 index 0000000..314b5bc --- /dev/null +++ b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/tomcat/webapp-classloading.xml @@ -0,0 +1,36 @@ +<?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. + --> + +<!-- + 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/e16acd17/features/mock-iaas/pom.xml ---------------------------------------------------------------------- diff --git a/features/mock-iaas/pom.xml b/features/mock-iaas/pom.xml new file mode 100644 index 0000000..736f1bb --- /dev/null +++ b/features/mock-iaas/pom.xml @@ -0,0 +1,39 @@ +<?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/xsd/maven-4.0.0.xsd";> + <parent> + <groupId>org.apache.stratos</groupId> + <artifactId>stratos-features-parent</artifactId> + <version>4.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>mock-iaas-features</artifactId> + <name>Apache Stratos - Mock IaaS Features</name> + <packaging>pom</packaging> + + <modules> + <module>org.apache.stratos.mock.iaas.api.feature</module> + </modules> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/pom.xml ---------------------------------------------------------------------- diff --git a/features/pom.xml b/features/pom.xml index efbcd53..1d9fd98 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -29,19 +29,15 @@ <modelVersion>4.0.0</modelVersion> <artifactId>stratos-features-parent</artifactId> <packaging>pom</packaging> - <name>Apache Stratos - Features Aggregator Module</name> + <name>Apache Stratos - Features</name> <url>http://apache.org</url> <modules> - <!-- Load Balancer --> <module>load-balancer</module> - <!-- Auto-Scaler --> <module>autoscaler</module> - <!-- Coud Controller --> + <module>mock-iaas</module> <module>cloud-controller</module> - <!-- Manager --> <module>manager</module> - <!-- Messaging --> <module>messaging</module> <module>common</module> </modules> http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/products/load-balancer/modules/p2-profile/pom.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/p2-profile/pom.xml b/products/load-balancer/modules/p2-profile/pom.xml index 3b88362..ac326c2 100755 --- a/products/load-balancer/modules/p2-profile/pom.xml +++ b/products/load-balancer/modules/p2-profile/pom.xml @@ -325,7 +325,6 @@ <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.version} </featureArtifactDef> - <!--***********************************************--> <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.version} </featureArtifactDef> @@ -399,14 +398,6 @@ <id>org.wso2.carbon.ntask.core.feature.group</id> <version>${carbon.version}</version> </feature> - <!--feature> - <id>org.wso2.carbon.coordination.server.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.coordination.core.feature.group</id> - <version>${carbon.version}</version> - </feature--> <feature> <id>org.wso2.carbon.registry.core.feature.group</id> <version>${carbon.version}</version> @@ -427,12 +418,10 @@ <id>org.wso2.carbon.databridge.datapublisher.feature.group</id> <version>${carbon.version}</version> </feature> - <!--***********************************************--> <feature> <id>org.wso2.carbon.event.server.feature.group</id> <version>${carbon.version}</version> </feature> - </features> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/products/stratos/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml index b904120..048ccb3 100755 --- a/products/stratos/modules/distribution/pom.xml +++ b/products/stratos/modules/distribution/pom.xml @@ -16,7 +16,8 @@ ~ 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";> +<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> @@ -38,34 +39,34 @@ <version>${rampart.mar.version}</version> <type>mar</type> </dependency> - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxrs</artifactId> - <version>2.2.0.GA</version> - <!-- filter out unwanted jars --> - <exclusions> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxb-provider</artifactId> - <version>2.2.0.GA</version> - </dependency> - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jackson-provider</artifactId> - <version>2.2.0.GA</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + <version>2.2.0.GA</version> + <!-- filter out unwanted jars --> + <exclusions> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxb-provider</artifactId> + <version>2.2.0.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jackson-provider</artifactId> + <version>2.2.0.GA</version> + </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.kubernetes.client</artifactId> <version>${project.version}</version> </dependency> @@ -466,7 +467,7 @@ </dependency> <!-- activemq client jars --> <dependency> - <groupId>org.apache.geronimo.specs</groupId> + <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee-management_1.1_spec</artifactId> <version>1.0.1</version> </dependency> @@ -476,29 +477,29 @@ <version>1.9</version> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-client</artifactId> - <version>5.9.1</version> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-client</artifactId> + <version>5.9.1</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.cep.extension</artifactId> <version>4.1.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.eclipse.paho</groupId> - <artifactId>mqtt-client</artifactId> - <version>0.4.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.wso2.carbon.ui</artifactId> - <version>4.2.0-stratos</version> + <dependency> + <groupId>org.eclipse.paho</groupId> + <artifactId>mqtt-client</artifactId> + <version>0.4.0</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.wso2.carbon.ui</artifactId> + <version>4.2.0-stratos</version> </dependency> </dependencies> @@ -572,17 +573,17 @@ </goals> <configuration> <tasks> - <copy - todir="target/wso2carbon-core-4.2.0/dbscripts/identity" - overwrite="false"> - <fileset - dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-4.2.0/dbscripts/identity/"> - </fileset> - </copy> + <copy + todir="target/wso2carbon-core-4.2.0/dbscripts/identity" + overwrite="false"> + <fileset + dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-4.2.0/dbscripts/identity/"> + </fileset> + </copy> <path id="h2.classpath"> - <path refid="maven.compile.classpath" /> + <path refid="maven.compile.classpath"/> </path> - <echo message="########### Adding identity , identity/application-mgt tables to WSO2Carbon DB ##############" /> + <echo message="########### Adding identity , identity/application-mgt tables to WSO2Carbon DB ##############"/> <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/target/wso2carbon-core-4.2.0/repository/database//WSO2CARBON_DB" @@ -606,15 +607,16 @@ file="target/wso2carbon-core-4.2.0/dbscripts/identity/h2.sql"/> </sql> - <echo message="########### Create Billing Database ##############" /> - <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/target/database/WSO2BILLING_DB" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue"> + <echo message="########### Create Billing Database ##############"/> + <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/target/database/WSO2BILLING_DB" + userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue"> <classpath> - <path refid="h2.classpath" /> + <path refid="h2.classpath"/> </classpath> - <fileset file="../../dbscripts/billing-h2.sql" /> - <fileset file="../../dbscripts/metering_h2.sql" /> + <fileset file="../../dbscripts/billing-h2.sql"/> + <fileset file="../../dbscripts/metering_h2.sql"/> </sql> - <echo message="##################### END ########################" /> + <echo message="##################### END ########################"/> </tasks> </configuration> </execution> @@ -623,14 +625,14 @@ <phase>install</phase> <configuration> <tasks> - <delete dir="target/archive-tmp" /> - <delete dir="target/dependency-maven-plugin-markers" /> - <delete dir="target/maven-archiver" /> - <delete dir="target/wso2carbon-core-${carbon.kernel.version}" /> - <delete dir="target/shopping-cart-global-${shoppingcart.global.version}" /> - <delete file="target/${project.artifactId}-${project.version}.jar" /> - <delete dir="target/sources" /> - <delete dir="target/database" /> + <delete dir="target/archive-tmp"/> + <delete dir="target/dependency-maven-plugin-markers"/> + <delete dir="target/maven-archiver"/> + <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/> + <delete dir="target/shopping-cart-global-${shoppingcart.global.version}"/> + <delete file="target/${project.artifactId}-${project.version}.jar"/> + <delete dir="target/sources"/> + <delete dir="target/database"/> </tasks> </configuration> <goals> http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/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 2313e4d..dc62b58 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -938,7 +938,13 @@ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory> <fileMode>644</fileMode> </file> - <!--oauth2.war and authenticationendpoint.war is related to oAuth feature --> + <!-- Mock iaas webapp --> + <file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mock-iaas-api.war</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory> + <fileMode>644</fileMode> + </file> + <!--oauth2.war and authenticationendpoint.war is related to oAuth feature --> <file> <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/oauth2.war</source> <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
