http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/python-cartridge-agent/pom.xml ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/pom.xml b/products/python-cartridge-agent/pom.xml index 0b32dff..d34c5f6 100644 --- a/products/python-cartridge-agent/pom.xml +++ b/products/python-cartridge-agent/pom.xml @@ -19,18 +19,16 @@ --> <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";> - + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-products-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>python-cartridge-agent-parent</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Python Cartridge Agent Product</name> - <url>http://apache.org</url> <description>Apache Stratos Python Cartridge Agent Product</description> <modules> @@ -38,5 +36,4 @@ distribution </module> </modules> -</project> - +</project> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/stratos-cli/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos-cli/distribution/pom.xml b/products/stratos-cli/distribution/pom.xml index 2d14858..3095ce1 100644 --- a/products/stratos-cli/distribution/pom.xml +++ b/products/stratos-cli/distribution/pom.xml @@ -17,34 +17,20 @@ ~ 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";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>apache-stratos-cli-parent</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>apache-stratos-cli</artifactId> <packaging>pom</packaging> <name>Apache Stratos - CLI</name> - <url>http://apache.org/</url> <description>Apache Stratos CLI Distribution</description> - <repositories> - <repository> - <id>wso2-nexus</id> - <name>WSO2 internal Repository</name> - <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url> - <releases> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - <checksumPolicy>ignore</checksumPolicy> - </releases> - </repository> - </repositories> - <dependencies> <dependency> <groupId>org.apache.stratos</groupId> @@ -59,13 +45,11 @@ <activation> <activeByDefault>true</activeByDefault> </activation> - <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> <configuration> <archive> <manifest> @@ -97,4 +81,4 @@ </build> </profile> </profiles> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/stratos-cli/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos-cli/distribution/src/main/assembly/bin.xml b/products/stratos-cli/distribution/src/main/assembly/bin.xml index a97afa5..4ea0bd0 100644 --- a/products/stratos-cli/distribution/src/main/assembly/bin.xml +++ b/products/stratos-cli/distribution/src/main/assembly/bin.xml @@ -85,4 +85,4 @@ <scope>runtime</scope> </dependencySet> </dependencySets> -</assembly> +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/stratos-cli/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos-cli/pom.xml b/products/stratos-cli/pom.xml index 37e2eed..066f68d 100644 --- a/products/stratos-cli/pom.xml +++ b/products/stratos-cli/pom.xml @@ -17,26 +17,22 @@ ~ 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> +<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-products-parent</artifactId> <version>4.1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - + <modelVersion>4.0.0</modelVersion> <artifactId>apache-stratos-cli-parent</artifactId> <packaging>pom</packaging> <name>Apache Stratos - CLI Product</name> - <url>http://apache.org</url> <description>Apache Stratos CLI</description> - <modules> - <module> - distribution - </module> + <module>distribution</module> </modules> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/stratos/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml index 5b2dc02..3ab571f 100755 --- a/products/stratos/modules/distribution/pom.xml +++ b/products/stratos/modules/distribution/pom.xml @@ -19,6 +19,7 @@ --> <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";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos</artifactId> @@ -26,11 +27,11 @@ <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>apache-stratos</artifactId> <packaging>jar</packaging> <name>Apache Stratos - Distribution</name> <description>Apache Stratos Manager Distribution</description> + <dependencies> <dependency> <groupId>org.apache.rampart</groupId> @@ -39,418 +40,20 @@ <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> - <artifactId>org.apache.stratos.kubernetes.client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.andes.wso2</groupId> - <artifactId>andes-client</artifactId> - <version>0.13.wso2v8</version> - <type>jar</type> - </dependency> - <!--dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>features-dashboard</artifactId> - <version>${features-dashboard.war.version}</version> - <type>war</type> - </dependency--> - <!--dependency> - <groupId>com.h2database.wso2</groupId> - <artifactId>h2-database-engine</artifactId> - <version>${orbit.version.h2.engine}</version> - </dependency--> - <!-- Carbon core distribution --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>wso2carbon-core</artifactId> - <version>${carbon.kernel.version}</version> - <type>zip</type> - </dependency> - <!-- Synapse dependencies --> - <!--dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-commons</artifactId> - <version>${synapse.version}</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-nhttp-transport</artifactId> - <version>${synapse.version}</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-pipe-transport</artifactId> - <version>${synapse.version}</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-core</artifactId> - <version>${synapse.version}</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-tasks</artifactId> - <version>${synapse.version}</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-extensions</artifactId> - <version>${synapse.version}</version> - </dependency--> - <!-- Carbon mediation initializer --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.mediation.initializer</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.mediator.bridge</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.mediation.dependency.mgt</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- ### Required Carbon components ### --> - <!-- Transport managament components --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.transport.mgt</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Transport components --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.transport.http</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.transport.nhttp</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.transport.https</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.transport.mail</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Sequence management components --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.mediator.service</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.sequences.common</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.sequences</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.mediator.router.impl</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.mediator.clazz.services</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.mediator.command.services</artifactId> - <version>${carbon.version}</version> - </dependency> - <!--Entitlement mediator dependency --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.identity.entitlement.mediator</artifactId> - <version>${carbon.version}</version> - </dependency> - <!--OAuth mediator dependency --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.identity.oauth.mediator</artifactId> - <version>${carbon.version}</version> - </dependency> - <!--Drools dependency--> - <dependency> - <groupId>org.drools.wso2</groupId> - <artifactId>drools</artifactId> - <version>5.0.1.wso2v1</version> - </dependency> - <dependency> - <groupId>jsr94.wso2</groupId> - <artifactId>jsr94</artifactId> - <version>1.1.0.wso2v1</version> - </dependency> - <dependency> - <groupId>org.mvel.wso2</groupId> - <artifactId>mvel2</artifactId> - <version>2.0.10.wso2v1</version> - </dependency> - <dependency> - <groupId>joda-time.wso2</groupId> - <artifactId>joda-time</artifactId> - <version>1.6.0.wso2v1</version> - </dependency> - <dependency> - <groupId>org.antlr.wso2</groupId> - <artifactId>antlr-runtime</artifactId> - <version>3.1.1.wso2v1</version> - </dependency> - <dependency> - <groupId>janino.wso2</groupId> - <artifactId>janino</artifactId> - <version>2.5.15.wso2v1</version> - </dependency> - <!-- Endpoints component --> - <!--dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.endpoint.common</artifactId> - <version>${carbon.version}</version> - </dependency--> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.endpoint</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Local Entries component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.localentry</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Service management component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.service.mgt</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Operation management component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.operation.mgt</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Module Management component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.module.mgt</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Security components (orbit) --> - <dependency> - <groupId>org.apache.rampart.wso2</groupId> - <artifactId>rampart-policy</artifactId> - <version>1.6.1.wso2v1</version> - </dependency> - <dependency> - <groupId>org.apache.rampart.wso2</groupId> - <artifactId>rampart-trust</artifactId> - <version>1.6.1.wso2v1</version> - </dependency> - <dependency> - <groupId>org.apache.rampart.wso2</groupId> - <artifactId>rampart-core</artifactId> - <version>1.6.1.wso2v1</version> - </dependency> - <!-- Policy Editor component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.policyeditor</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Task component with startups --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.startup</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.task</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.task.services</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Synapse Config admin component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.mediation.configadmin</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Synapse Registry component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.mediation.registry</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Datasources component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.datasource</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Throttle component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.throttle</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Caching component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.caching</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- RM component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.rm</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- Menus --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.ui.menu.registry</artifactId> - <version>${carbon.version}</version> - </dependency> - <!-- ### Required Carbon orbit dependencies ### --> - <dependency> - <groupId>org.apache.geronimo.specs.wso2</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.1.0.wso2v1</version> - </dependency> - <dependency> - <groupId>commons-net.wso2</groupId> - <artifactId>commons-net</artifactId> - <version>2.0.wso2v1</version> - </dependency> - <dependency> - <groupId>jsch.wso2</groupId> - <artifactId>jsch</artifactId> - <version>0.1.41-wso2v1</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents.wso2</groupId> - <artifactId>httpcore-nio</artifactId> - <version>4.1.0.wso2v2</version> - </dependency> - <dependency> - <groupId>org.quartz-scheduler.wso2</groupId> - <artifactId>quartz</artifactId> - <version>2.1.1.wso2v1</version> - </dependency> - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - <version>1.0.1</version> - </dependency> - <!--dependency> - <groupId>net.sf.saxon.wso2</groupId> - <artifactId>saxon</artifactId> - <version>8.9.0.wso2v1</version> - </dependency--> - <dependency> - <groupId>org.apache.abdera.wso2</groupId> - <artifactId>abdera</artifactId> - <version>1.0.wso2v1</version> - </dependency> - <dependency> - <groupId>org.springframework.ws.wso2</groupId> - <artifactId>spring.framework</artifactId> - <version>2.5.1.wso2v1</version> - </dependency> - <dependency> - <groupId>commons-io.wso2</groupId> - <artifactId>commons-io</artifactId> - <version>2.0.0.wso2v1</version> - </dependency> - <dependency> - <groupId>commons-collections.wso2</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.0.wso2v1</version> - </dependency> - <dependency> - <groupId>org.apache.ws.savan.wso2</groupId> - <artifactId>savan-core</artifactId> - <version>1.0.0-wso2v2</version> - </dependency> - <dependency> - <groupId>org.wso2.caching</groupId> - <artifactId>wso2caching-core</artifactId> - <version>3.5.0</version> - </dependency> - <!--Bouncycastle dependency for clients and servers--> - <dependency> <groupId>bouncycastle</groupId> <artifactId>bcprov-jdk15</artifactId> <version>132</version> </dependency> - <!-- autoscale components --> <dependency> <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.mediator.autoscale</artifactId> - <version>4.0.3</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.discovery.core</artifactId> - <version>${carbon.version}</version> + <artifactId>org.wso2.carbon.mediator.bridge</artifactId> + <version>${carbon.kernel.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.relay</artifactId> - <version>${carbon.version}</version> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-client</artifactId> + <version>5.10.0</version> </dependency> - <!-- activemq client jars --> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee-management_1.1_spec</artifactId> @@ -462,9 +65,9 @@ <version>1.9</version> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-client</artifactId> - <version>5.10.0</version> + <groupId>org.eclipse.paho</groupId> + <artifactId>mqtt-client</artifactId> + <version>0.4.0</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> @@ -472,11 +75,6 @@ <version>${project.version}</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> @@ -487,6 +85,7 @@ <version>${carbon.ui.stratos.version}</version> </dependency> </dependencies> + <build> <plugins> <plugin> @@ -531,14 +130,6 @@ <overWrite>true</overWrite> <outputDirectory>target</outputDirectory> </artifactItem> - <artifactItem> - <groupId>com.acme.shoppingcart.global</groupId> - <artifactId>shopping-cart-global</artifactId> - <version>${shoppingcart.global.version}</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>target</outputDirectory> - </artifactItem> </artifactItems> </configuration> </execution> @@ -593,7 +184,6 @@ <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"/> @@ -619,21 +209,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> - <!--<execution> - <id>1-pre_dist</id> - <phase>test</phase> - <goals> - <goal>attached</goal> - </goals> - <configuration> - <filters> - <filter>${basedir}/src/assembly/filter.properties</filter> - </filters> - <descriptors> - <descriptor>${basedir}/src/assembly/dist.xml</descriptor> - </descriptors> - </configuration> - </execution>--> <execution> <id>4-dist</id> <phase>package</phase> @@ -697,8 +272,6 @@ </filters> <descriptors> <descriptor>${basedir}/src/assembly/bin.xml</descriptor> - <!--<descriptor>${basedir}/src/assembly/src.xml</descriptor>--> - <!--<descriptor>${basedir}/src/assembly/docs.xml</descriptor>--> </descriptors> </configuration> </execution> @@ -708,4 +281,4 @@ </build> </profile> </profiles> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 c74d80a..06ec14a 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -26,7 +26,7 @@ <fileSets> <fileSet> <directory>target/wso2carbon-core-${carbon.kernel.version}</directory> - <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}</outputDirectory> <excludes> <exclude>**/*.sh</exclude> <exclude>**/wso2server.bat</exclude> @@ -62,7 +62,7 @@ <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components </directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components</outputDirectory> <excludes> <exclude>**/eclipse.ini</exclude> <exclude>**/*.lock</exclude> @@ -84,7 +84,7 @@ <!-- Exclude non-Apache2 compliant dependency from lib/endorsed/ directory--> <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/endorsed</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/lib/endorsed</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/lib/endorsed</outputDirectory> <excludes> <exclude>**/jboss-transaction-api_1.1_spec-1.0.0.Final.jar</exclude> </excludes> @@ -93,7 +93,7 @@ <directory> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps </directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/jaggeryapps</outputDirectory> <excludes> <exclude>**/publisher/**</exclude> <exclude>**/store/**</exclude> @@ -105,7 +105,7 @@ </fileSet> <fileSet> <directory>target/shopping-cart-global-${shoppingcart.global.version}</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/samples/bin</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/samples/bin</outputDirectory> <includes> <include>**/*.car</include> <include>**/*.properties</include> @@ -113,7 +113,7 @@ </fileSet> <fileSet> <directory>../../../../components/org.apache.stratos.manager.console/console</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/console + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/jaggeryapps/console </outputDirectory> <excludes> <exclude>**/README</exclude> @@ -121,16 +121,16 @@ </fileSet> <fileSet> <directory>../../../../components/org.apache.stratos.manager.console/sso</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/sso + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/jaggeryapps/sso </outputDirectory> </fileSet> <fileSet> <directory>../../../../components/org.apache.stratos.manager.console/modules/console</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/modules/console</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/modules/console</outputDirectory> </fileSet> <fileSet> <directory>target/wso2carbon-core-${carbon.kernel.version}</directory> - <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}</outputDirectory> <excludes> <exclude>**/daemon.sh</exclude> <exclude>**/log4j.properties</exclude> @@ -148,7 +148,7 @@ <!-- Copying themes, cloud icons--> <fileSet> <directory>src/main/resources</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/resources</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/resources</outputDirectory> <fileMode>755</fileMode> <includes> <include>allthemes/**</include> @@ -159,7 +159,7 @@ <!-- ADC management related files --> <fileSet> <directory>src/main/conf/</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <includes> <include>cartridge-config.properties</include> <include>policies.xml</include> @@ -167,7 +167,7 @@ </fileSet> <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/etc</outputDirectory> <includes> <include>policies.xsd</include> </includes> @@ -175,14 +175,14 @@ <fileSet> <directory>../p2-profile/target/wso2carbon-core-${carbon.platform.version}/repository/conf/etc/</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/etc</outputDirectory> <includes> <include>**/cassandra.yaml</include> </includes> </fileSet> <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/</outputDirectory> <includes> <include>**/rule-engine-config.xml</include> </includes> @@ -190,7 +190,7 @@ <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ </directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/multitenancy/</outputDirectory> <includes> <include>**/multitenancy-packages.xml</include> <include>**/stratos.xml</include> @@ -199,7 +199,7 @@ </fileSet> <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/dbscripts</outputDirectory> <excludes> <exclude>**/identity/**</exclude> <!-- Patched in WSO2-CARBON-PATCH-4.2.0-0001, WSO2-CARBON-PATCH-4.2.0-0012 and WSO2-CARBON-PATCH-4.2.0-0003 @@ -215,7 +215,7 @@ </fileSet> <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/identity</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/dbscripts/identity</outputDirectory> <includes> <include>**/**.sql</include> </includes> @@ -224,7 +224,7 @@ <!-- copy cxf runtime --> <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/lib/runtimes/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/lib/runtimes/</outputDirectory> <includes> <include>*/**</include> </includes> @@ -232,7 +232,7 @@ <!-- copy jaggery modules --> <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/modules</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/modules</outputDirectory> <excludes> <exclude>**/carbon/**</exclude> </excludes> @@ -242,40 +242,40 @@ </fileSet> <fileSet> <directory>src/main/conf/multitenancy</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/multitenancy</outputDirectory> </fileSet> <!-- copy the billing h2 db --> <fileSet> <directory>target/database</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/database</outputDirectory> </fileSet> <!-- Apply Kernel Patches--> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0001/*.*</include> </includes> </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0002/*.*</include> </includes> </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0003</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0003/*.*</include> </includes> </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <excludes> <exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude> </excludes> @@ -285,21 +285,21 @@ </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0005</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0005/*.*</include> </includes> </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0006</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0006/*.*</include> </includes> </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0007</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <excludes> <exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude> </excludes> @@ -309,14 +309,14 @@ </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0008</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0008/*.*</include> </includes> </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0009</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <excludes> <exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude> </excludes> @@ -326,7 +326,7 @@ </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0010</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <excludes> <exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude> </excludes> @@ -336,7 +336,7 @@ </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0011</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <excludes> <exclude>**/org.wso2.carbon.ui-4.2.0.jar</exclude> </excludes> @@ -346,7 +346,7 @@ </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0012</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory> <excludes> <exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude> </excludes> @@ -358,7 +358,7 @@ <!-- Additional configuration for kernel patches --> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/dbscripts</outputDirectory> <includes> <include>**/db2.sql</include> <include>**/mysql.sql</include> @@ -366,35 +366,35 @@ </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0003/dbscripts</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/dbscripts</outputDirectory> <includes> <include>**/mysql_cluster.sql</include> </includes> </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0009/bin</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/bin</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/bin</outputDirectory> <includes> <include>**/org.wso2.carbon.bootstrap_4.2.0.jar</include> </includes> </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0010/lib</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/lib</outputDirectory> <includes> <include>**/org.wso2.ciphertool-1.0.0-wso2v2.jar</include> </includes> </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0012/lib</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/lib</outputDirectory> <includes> <include>**/org.wso2.carbon.server-4.2.0.jar</include> </includes> </fileSet> <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0012/dbscripts</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/dbscripts</outputDirectory> <includes> <include>**/oracle_rac.sql</include> </includes> @@ -403,22 +403,22 @@ <!-- Jaggery modules --> <fileSet> <directory>src/main/temp-artifacts/sso</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/modules/sso</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/modules/sso</outputDirectory> </fileSet> <fileSet> <directory>src/main/temp-artifacts/carbon</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/modules/carbon</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/modules/carbon</outputDirectory> </fileSet> <fileSet> <directory>src/main/temp-artifacts</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/plugins</outputDirectory> <includes> <include>org.wso2.store.sso.common_1.0.0.jar</include> </includes> </fileSet> <fileSet> <directory>src/main/temp-artifacts</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/plugins</outputDirectory> <includes> <include>org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar</include> </includes> @@ -426,7 +426,7 @@ <!-- autoscaler --> <fileSet> <directory>src/main/temp-artifacts</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/plugins</outputDirectory> <includes> <include>org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar</include> </includes> @@ -436,70 +436,70 @@ <!--creating an empty input event adaptors directory--> <fileSet> <directory>../../../../extensions/cep/artifacts/inputeventadaptors</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/inputeventadaptors + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/inputeventadaptors </outputDirectory> </fileSet> <!--creating an empty output event adaptors directory--> <fileSet> <directory>../../../../extensions/cep/artifacts/outputeventadaptors</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/outputeventadaptors + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/outputeventadaptors </outputDirectory> </fileSet> <!--creating an empty event builders directory--> <fileSet> <directory>../../../../extensions/cep/artifacts/eventbuilders</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventbuilders + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/eventbuilders </outputDirectory> </fileSet> <!--creating an empty event formatters directory--> <fileSet> <directory>../../../../extensions/cep/artifacts/eventformatters</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventformatters + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/eventformatters </outputDirectory> </fileSet> <!--creating an empty execution plans directory--> <fileSet> <directory>../../../../extensions/cep/artifacts/executionplans</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/executionplans + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/executionplans </outputDirectory> </fileSet> <!--customization scripts--> <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/scripts </directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/scripts</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/scripts</outputDirectory> </fileSet> </fileSets> <dependencySets> <dependencySet> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/lib</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/lib</outputDirectory> <includes> <include>bouncycastle:bcprov-jdk15:jar</include> </includes> </dependencySet> <!-- use the new tool to create a bundles --> <dependencySet> - <outputDirectory>${pom.artifactId}-${pom.version}/lib/core/WEB-INF/lib</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/lib/core/WEB-INF/lib</outputDirectory> <includes> <include>org.wso2.carbon:org.wso2.carbon.mediator.bridge:jar</include> </includes> </dependencySet> <dependencySet> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/axis2/client/lib</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/axis2/client/lib</outputDirectory> <includes> <include>bouncycastle:bcprov-jdk15:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> </dependencySet> <dependencySet> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/client/modules</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/client/modules</outputDirectory> <includes> <include>org.apache.rampart:rampart:mar</include> </includes> </dependencySet> <dependencySet> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/lib</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/lib</outputDirectory> <includes> <include>org.apache.activemq:activemq-client:jar</include> <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:jar</include> @@ -508,19 +508,19 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/lib</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/lib</outputDirectory> <includes> <include>org.apache.stratos:org.apache.stratos.cep.extension:jar</include> </includes> </dependencySet> <dependencySet> - <outputDirectory>${pom.artifactId}-${pom.version}/lib/endorsed</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/lib/endorsed</outputDirectory> <includes> <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include> </includes> </dependencySet> <dependencySet> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/dropins</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/components/dropins</outputDirectory> <includes> <include>org.apache.stratos:org.wso2.carbon.ui:jar</include> </includes> @@ -530,81 +530,81 @@ <files> <file> <source>src/main/conf/carbon.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/</outputDirectory> <filtered>true</filtered> </file> <file> <source>src/main/conf/security/authenticators.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/security</outputDirectory> <filtered>true</filtered> </file> <file> <source>src/main/conf/security/cipher-text.properties</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/security</outputDirectory> <filtered>true</filtered> </file> <file> <source>src/main/conf/security/cipher-tool.properties</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/security</outputDirectory> <filtered>true</filtered> </file> <file> <source>src/main/conf/log4j.properties</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/jndi.properties</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/tenant-mgt.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/registry.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/user-mgt.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/mqtttopic.properties</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/event-broker.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/sso-idp-config.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <!-- cep --> <file> <source>src/main/conf/siddhi/siddhi.extension</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/siddhi/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/siddhi/</outputDirectory> <filtered>true</filtered> </file> <file> <source>../../../../extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/</outputDirectory> <filtered>true</filtered> </file> <!-- cloud-controller --> @@ -612,123 +612,123 @@ <source> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cloud-controller.xml </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> </file> <!-- cloud-controller --> <!-- autoscaler --> <file> <source>src/main/conf/autoscaler.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/mock-iaas.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <!-- identity.xml and application-authentication.xml for oAuth feature --> <file> <source>src/main/conf/identity.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/security/application-authentication.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/security/</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/application-authenticators.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/security/client-truststore.jks</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/resources/security/</outputDirectory> <filtered>false</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/axis2/axis2.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/axis2/</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/axis2/axis2_client.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/axis2/</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/axis2/tenant-axis2.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/axis2/</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/drools/mincheck.drl</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/drools</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/drools/maxcheck.drl</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/drools</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/drools/obsoletecheck.drl</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/drools</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/drools/scaling.drl</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/drools</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/drools/dependent-scaling.drl</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/drools</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <file> <source>src/main/conf/drools/terminateall.drl</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/drools</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory> <filtered>true</filtered> <fileMode>600</fileMode> </file> <!-- autoscaler --> <file> <source>${project.basedir}/INSTALL.txt</source> - <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> <file> <source>src/main/conf/etc/launch.ini</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/etc</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> <file> <source>src/main/notice/NOTICE</source> - <outputDirectory>apache-stratos-${pom.version}</outputDirectory> + <outputDirectory>apache-stratos-${project.version}</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> <file> <source>src/main/license/LICENSE</source> - <outputDirectory>apache-stratos-${pom.version}</outputDirectory> + <outputDirectory>apache-stratos-${project.version}</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> @@ -737,7 +737,7 @@ <source> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/tomcat</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> @@ -745,7 +745,7 @@ <source> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/tomcat</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> @@ -753,25 +753,25 @@ <source> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/tomcat</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> <file> <source>${project.basedir}/README.txt</source> - <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> <file> <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source> - <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/bin/</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> <file> <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source> - <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/bin/</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> @@ -779,7 +779,7 @@ <source> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/userRP.jks </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/resources/security/</outputDirectory> <fileMode>644</fileMode> </file> <!-- Including logging-config.xml file --> @@ -787,24 +787,24 @@ <source> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/etc/</outputDirectory> </file> <file> <source>src/bin/stratos.sh</source> - <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory> + <outputDirectory>apache-stratos-${project.version}/bin/</outputDirectory> <filtered>true</filtered> <fileMode>755</fileMode> </file> <file> <source>src/bin/stratos.bat</source> - <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory> + <outputDirectory>apache-stratos-${project.version}/bin/</outputDirectory> <filtered>true</filtered> <fileMode>755</fileMode> </file> <file> <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> @@ -812,14 +812,14 @@ <source> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/etc</outputDirectory> </file> <!-- REST endpoint webapp --> <file> <source> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/api.war </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/webapps/</outputDirectory> <fileMode>644</fileMode> </file> <!-- Mock iaas webapp --> @@ -827,7 +827,7 @@ <source> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mock-iaas.war </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/webapps/</outputDirectory> <fileMode>644</fileMode> </file> <!--oauth2.war and authenticationendpoint.war is related to oAuth feature --> @@ -835,14 +835,14 @@ <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> + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/webapps/</outputDirectory> <fileMode>644</fileMode> </file> <file> <source> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/authenticationendpoint.war </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/webapps/</outputDirectory> <fileMode>644</fileMode> </file> <!-- End of REST endpoint webapp --> @@ -851,23 +851,23 @@ <source> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/metadata.war </source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/webapps/</outputDirectory> <fileMode>644</fileMode> </file> <!-- End of Meta data service webapp --> <file> <source>src/main/conf/data-bridge/data-bridge-config.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/data-bridge/</outputDirectory> <fileMode>644</fileMode> </file> <file> <source>src/main/conf/data-bridge/thrift-agent-config.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/data-bridge/</outputDirectory> <fileMode>644</fileMode> </file> <file> <source>src/main/conf/thrift-client-config.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + <outputDirectory>${project.artifactId}-${project.version}/repository/conf/</outputDirectory> <fileMode>644</fileMode> </file> </files> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/stratos/modules/integration/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/pom.xml b/products/stratos/modules/integration/pom.xml index 992b2a2..3c08edf 100755 --- a/products/stratos/modules/integration/pom.xml +++ b/products/stratos/modules/integration/pom.xml @@ -20,7 +20,7 @@ <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";> - + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos</artifactId> @@ -28,7 +28,6 @@ <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>stratos-integration</artifactId> <name>Apache Stratos - Integration Tests</name> <packaging>jar</packaging> @@ -57,24 +56,24 @@ <dependency> <groupId>org.apache.axis2.wso2</groupId> <artifactId>axis2-client</artifactId> - <version>${axis2.osgi.version}</version> + <version>${axis2.wso2.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.addressing</artifactId> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.integration.core</artifactId> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>SecVerifier</artifactId> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> <type>aar</type> </dependency> <dependency> @@ -141,6 +140,7 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> @@ -156,7 +156,7 @@ </configuration> </execution> <execution> - <id>copy-secVerifier</id> + <id>copy-secVerifier</id> <phase>compile</phase> <goals> <goal>copy-dependencies</goal> @@ -172,4 +172,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file
