http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/load-balancer/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/pom.xml b/products/load-balancer/modules/distribution/pom.xml index 0eea848..e099f8d 100755 --- a/products/load-balancer/modules/distribution/pom.xml +++ b/products/load-balancer/modules/distribution/pom.xml @@ -17,9 +17,10 @@ ~ 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.load.balancer</groupId> <artifactId>load-balancer-parent</artifactId> @@ -27,426 +28,43 @@ <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>apache-stratos-load-balancer</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Load Balancer - Distribution</name> - <url>http://apache.org</url> <description>Apache Stratos Load Balancer Distribution</description> <dependencies> - - <!-- 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>2.1.2-wso2v3</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-nhttp-transport</artifactId> - <version>2.1.2-wso2v3</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-pipe-transport</artifactId> - <version>2.1.1-wso2v4</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-core</artifactId> - <version>2.1.2-wso2v3</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-tasks</artifactId> - <version>2.1.2-wso2v3</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-extensions</artifactId> - <version>2.1.2-wso2v3</version> - </dependency> - - <!-- Carbon mediation initializer --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.mediation.initializer</artifactId> - <version>4.2.0</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>4.2.0</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>4.2.0</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> + <version>${carbon.kernel.version}</version> </dependency> - <dependency> - <groupId>org.apache.rampart.wso2</groupId> - <artifactId>rampart-core</artifactId> - <version>1.6.1.wso2v1</version> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk15</artifactId> + <version>132</version> </dependency> - <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart</artifactId> <type>mar</type> <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> - <!-- Eventing components --> - <!--dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.eventing</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.eventing.core</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.eventing.impl</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.eventing.broker</artifactId> - <version>${carbon.version}</version> - </dependency--> - <!-- Eventsource component.--> - <!-- Removed since this is not required by LB product.--> - <!--dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.eventing.eventsource</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>org.wso2.andes.wso2</groupId> <artifactId>andes-client</artifactId> <version>0.13.wso2v8</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.2.3.wso2v1</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> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.discovery.core</artifactId> - <version>${carbon.version}</version> + <groupId>org.apache.geronimo.specs.wso2</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <version>1.1.0.wso2v1</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> @@ -458,15 +76,10 @@ <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.eclipse.paho</groupId> - <artifactId>mqtt-client</artifactId> - <version>0.4.0</version> - </dependency> </dependencies> <build> @@ -507,11 +120,11 @@ <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/sources" /> + <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/sources"/> </tasks> </configuration> <goals> @@ -519,9 +132,7 @@ </goals> </execution> </executions> - </plugin> - - + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> @@ -546,5 +157,4 @@ </plugin> </plugins> </build> - -</project> +</project> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/load-balancer/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml index 6812cec..6c0fc1e 100755 --- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml +++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml @@ -67,7 +67,8 @@ </fileSet> <!-- Copying p2 profile and osgi bundles--> <fileSet> - <directory>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components + </directory> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components</outputDirectory> <excludes> <exclude>**/eclipse.ini</exclude> @@ -106,7 +107,8 @@ </outputDirectory> </fileSet> <fileSet> - <directory>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/</directory> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/ + </directory> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/etc</outputDirectory> <includes> <include>*.xsd</include> @@ -115,56 +117,56 @@ <!-- Kernel Patches--> <fileSet> - <directory>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0001</directory> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001</directory> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0001/*.*</include> </includes> </fileSet> <fileSet> - <directory>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002</directory> + <directory>../p2-profile-gentarget/WSO2-CARBON-PATCH-4.2.0-0002</directory> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0002/*.*</include> </includes> </fileSet> <fileSet> - <directory>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0003</directory> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0003</directory> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0003/*.*</include> </includes> </fileSet> <fileSet> - <directory>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0004</directory> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004</directory> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0004/*.*</include> </includes> </fileSet> <fileSet> - <directory>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0005</directory> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0005</directory> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0005/*.*</include> </includes> </fileSet> <fileSet> - <directory>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0006</directory> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0006</directory> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0006/*.*</include> </includes> </fileSet> <fileSet> - <directory>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0007</directory> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0007</directory> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0007/*.*</include> </includes> </fileSet> <fileSet> - <directory>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0008</directory> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0008</directory> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory> <includes> <include>**/patch0008/*.*</include> @@ -201,8 +203,6 @@ <includes> <include>org.wso2.andes.wso2:andes-client:jar</include> <include>org.apache.geronimo.specs.wso2:geronimo-jms_1.1_spec:jar</include> - <!--include>org.wso2.carbon:org.wso2.carbon.event.client.stub:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.event.client:jar</include--> </includes> </dependencySet> <dependencySet> @@ -233,7 +233,7 @@ </file> <file> <source> - ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml </source> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory> </file> @@ -344,45 +344,44 @@ <!--Copying config files from kernel patches --> <file> - <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source> + <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source> <outputDirectory>apache-stratos-load-balancer-${pom.version}/dbscripts</outputDirectory> <filtered>true</filtered> </file> <!-- <file> - <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2_client.xml</source> + <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2_client.xml</source> <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> <filtered>true</filtered> </file> <file> - <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2.xml</source> + <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2.xml</source> <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> <filtered>true</filtered> </file> <file> - <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/tenant-axis2.xml</source> + <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/tenant-axis2.xml</source> <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> <filtered>true</filtered> </file>--> <file> - <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties + <source> + ../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties </source> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/security/</outputDirectory> <filtered>true</filtered> </file> <file> - <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties + <source> + ../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties </source> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/security/</outputDirectory> <filtered>true</filtered> </file> - - <file> - <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0004/repository/conf/carbon.xml</source> + <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004/repository/conf/carbon.xml</source> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/</outputDirectory> <filtered>true</filtered> </file> - </files> -</assembly> +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/load-balancer/modules/p2-profile-gen/pom.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/p2-profile-gen/pom.xml b/products/load-balancer/modules/p2-profile-gen/pom.xml new file mode 100755 index 0000000..2fdce8f --- /dev/null +++ b/products/load-balancer/modules/p2-profile-gen/pom.xml @@ -0,0 +1,423 @@ +<?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";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.stratos.load.balancer</groupId> + <artifactId>load-balancer-parent</artifactId> + <version>4.1.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <artifactId>apache-stratos-load-balancer-p2-profile-gen</artifactId> + <packaging>pom</packaging> + <name>Apache Stratos - Load Balancer - P2 Profile Generation</name> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <id>unpack-carbon-core</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>wso2carbon-core</artifactId> + <version>${carbon.kernel.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>unpack-kernel-patch-1</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0001</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>unpack-kernel-patch-2</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0002</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>unpack-kernel-patch-3</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0003</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>unpack-kernel-patch-4</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0004</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>unpack-kernel-patch-5</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0005</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>unpack-kernel-patch-6</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0006</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>unpack-kernel-patch-7</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0007</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>unpack-kernel-patch-8</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0008</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.wso2.maven</groupId> + <artifactId>carbon-p2-plugin</artifactId> + <executions> + <execution> + <id>2-p2-repo-generation</id> + <phase>package</phase> + <goals> + <goal>p2-repo-gen</goal> + </goals> + <configuration> + <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository> + <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository> + <publishArtifacts>true</publishArtifacts> + <publishArtifactRepository>true</publishArtifactRepository> + <featureArtifacts> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.service.mgt.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.transport.mgt.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.transport.nhttp.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.apache.synapse.wso2.feature:${synapse.wso2.feature.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.apache.synapse.transport.nhttp.feature:${synapse.wso2.feature.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.task.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.mediation.initializer.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.apache.stratos:org.apache.stratos.load.balancer.feature:${project.version} + </featureArtifactDef> + <featureArtifactDef> + org.apache.stratos:org.apache.stratos.load.balancer.common.feature:${project.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.sequences.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.mediators.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.relay.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.ntask.core.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.apache.stratos:org.apache.stratos.messaging.feature:${project.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.security.mgt.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.module.mgt.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.throttle.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.caching.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.rm.server.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.kernel.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.kernel.version} + </featureArtifactDef> + </featureArtifacts> + </configuration> + </execution> + <execution> + <id>p2-profile-generation</id> + <phase>package</phase> + <goals> + <goal>p2-profile-gen</goal> + </goals> + <configuration> + <profile>default</profile> + <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository> + <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository> + <destination> + ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components + </destination> + <deleteOldProfileFiles>true</deleteOldProfileFiles> + <features> + <feature> + <id>org.apache.synapse.wso2.feature.group</id> + <version>${synapse.wso2.feature.version}</version> + </feature> + <feature> + <id>org.apache.synapse.transport.nhttp.feature.group</id> + <version>${synapse.wso2.feature.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.task.server.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.datasource.server.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.mediation.initializer.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.service.mgt.server.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.transport.mgt.server.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.transport.nhttp.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.endpoint.server.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.sequences.server.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.mediators.server.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.relay.server.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.ntask.core.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.registry.core.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.apache.stratos.messaging.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.load.balancer.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.load.balancer.common.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.databridge.datapublisher.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.event.server.feature.group</id> + <version>${carbon.kernel.version}</version> + </feature> + </features> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <configuration> + <tasks> + <replace token="false" value="true" + dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator"> + <include name="**/bundles.info"/> + </replace> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 deleted file mode 100755 index ca2c7ae..0000000 --- a/products/load-balancer/modules/p2-profile/pom.xml +++ /dev/null @@ -1,451 +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.load.balancer</groupId> - <artifactId>load-balancer-parent</artifactId> - <version>4.1.2-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>apache-stratos-load-balancer-p2-profile-gen</artifactId> - <packaging>pom</packaging> - <name>Apache Stratos - Load Balancer - P2 Profile Generation</name> - <url>http://www.apache.org</url> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <inherited>false</inherited> - <executions> - <execution> - <id>unpack-carbon-core</id> - <phase>test</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.wso2.carbon</groupId> - <artifactId>wso2carbon-core</artifactId> - <version>${carbon.kernel.version}</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - <execution> - <id>unpack-kernel-patch-1</id> - <phase>test</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.wso2.carbon</groupId> - <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> - <version>0001</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - <execution> - <id>unpack-kernel-patch-2</id> - <phase>test</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.wso2.carbon</groupId> - <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> - <version>0002</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - <execution> - <id>unpack-kernel-patch-3</id> - <phase>test</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.wso2.carbon</groupId> - <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> - <version>0003</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - <execution> - <id>unpack-kernel-patch-4</id> - <phase>test</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.wso2.carbon</groupId> - <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> - <version>0004</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - <execution> - <id>unpack-kernel-patch-5</id> - <phase>test</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.wso2.carbon</groupId> - <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> - <version>0005</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - <execution> - <id>unpack-kernel-patch-6</id> - <phase>test</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.wso2.carbon</groupId> - <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> - <version>0006</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - <execution> - <id>unpack-kernel-patch-7</id> - <phase>test</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.wso2.carbon</groupId> - <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> - <version>0007</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - <execution> - <id>unpack-kernel-patch-8</id> - <phase>test</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.wso2.carbon</groupId> - <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> - <version>0008</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.wso2.maven</groupId> - <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> - <executions> - <execution> - <id>2-p2-repo-generation</id> - <phase>package</phase> - <goals> - <goal>p2-repo-gen</goal> - </goals> - <configuration> - <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository> - <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository> - <publishArtifacts>true</publishArtifacts> - <publishArtifactRepository>true</publishArtifactRepository> - <featureArtifacts> - <!--featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.aws.java.sdk.feature:1.0.0 - </featureArtifactDef--> - - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.service.mgt.server.feature:${carbon.version} - </featureArtifactDef> - - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.transport.mgt.server.feature:${carbon.version} - </featureArtifactDef> - - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.transport.nhttp.feature:${carbon.version} - </featureArtifactDef> - - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.version} - </featureArtifactDef> - <featureArtifactDef> - org.wso2.carbon:org.apache.synapse.wso2.feature:${synapse.version} - </featureArtifactDef> - <featureArtifactDef> - org.wso2.carbon:org.apache.synapse.transport.nhttp.feature:${synapse.version} - </featureArtifactDef> - - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.task.server.feature:${carbon.version} - </featureArtifactDef> - - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.mediation.initializer.feature:${carbon.version} - </featureArtifactDef> - - <!--featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.localentry.server.feature:${carbon.version} - </featureArtifactDef--> - - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.version} - </featureArtifactDef> - - <featureArtifactDef> - org.apache.stratos:org.apache.stratos.load.balancer.feature:${project.version} - </featureArtifactDef> - - <featureArtifactDef> - org.apache.stratos:org.apache.stratos.load.balancer.common.feature:${project.version} - </featureArtifactDef> - - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.sequences.server.feature:${carbon.version} - </featureArtifactDef> - - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.mediators.server.feature:${carbon.version} - </featureArtifactDef> - - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.relay.server.feature:${carbon.version} - </featureArtifactDef> - - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.ntask.core.feature:${carbon.version} - </featureArtifactDef> - - <featureArtifactDef> - org.apache.stratos:org.apache.stratos.messaging.feature:${project.version} - </featureArtifactDef> - <!--featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.coordination.server.feature:${carbon.version} - </featureArtifactDef> - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.coordination.core.feature:${carbon.version} - </featureArtifactDef--> - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.version} - </featureArtifactDef> - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.security.mgt.server.feature:${carbon.version} - </featureArtifactDef> - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.module.mgt.server.feature:${carbon.version} - </featureArtifactDef> - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.throttle.server.feature:${carbon.version} - </featureArtifactDef> - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.caching.server.feature:${carbon.version} - </featureArtifactDef> - <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.rm.server.feature:${carbon.version} - </featureArtifactDef> - <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> - </featureArtifacts> - </configuration> - </execution> - <execution> - <id>p2-profile-generation</id> - <phase>package</phase> - <goals> - <goal>p2-profile-gen</goal> - </goals> - <configuration> - <profile>default</profile> - <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository> - <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository> - <destination> - ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components - </destination> - <deleteOldProfileFiles>true</deleteOldProfileFiles> - <features> - <feature> - <id>org.apache.synapse.wso2.feature.group</id> - <version>${synapse.version}</version> - </feature> - <feature> - <id>org.apache.synapse.transport.nhttp.feature.group</id> - <version>${synapse.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.task.server.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.datasource.server.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.mediation.initializer.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.service.mgt.server.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.transport.mgt.server.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.transport.nhttp.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.endpoint.server.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.sequences.server.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.mediators.server.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.relay.server.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.ntask.core.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.wso2.carbon.registry.core.feature.group</id> - <version>${carbon.version}</version> - </feature> - <feature> - <id>org.apache.stratos.messaging.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> - <id>org.apache.stratos.load.balancer.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> - <id>org.apache.stratos.load.balancer.common.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> - <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> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <configuration> - <tasks> - <replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator"> - <include name="**/bundles.info" /> - </replace> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/load-balancer/pom.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/pom.xml b/products/load-balancer/pom.xml index 78eac02..9ff2581 100755 --- a/products/load-balancer/pom.xml +++ b/products/load-balancer/pom.xml @@ -17,8 +17,9 @@ ~ 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>stratos-parent</artifactId> @@ -26,26 +27,17 @@ <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.apache.stratos.load.balancer</groupId> <artifactId>load-balancer-parent</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Load Balancer Product</name> - <url>http://apache.org</url> <description>Apache Stratos Load Balancer</description> <modules> - <module>modules/p2-profile</module> + <module>modules/p2-profile-gen</module> <module>modules/distribution</module> </modules> - <pluginRepositories> - <pluginRepository> - <id>wso2-maven2-repository</id> - <url>http://dist.wso2.org/maven2</url> - </pluginRepository> - </pluginRepositories> - <profiles> <profile> <id>signed-build</id> @@ -73,61 +65,4 @@ </build> </profile> </profiles> - - <dependencyManagement> - <dependencies> - <!-- Dependencies for dashboard ui --> - <dependency> - <groupId>org.apache.axis2.wso2</groupId> - <artifactId>axis2</artifactId> - <version>${axis2.wso2.version}</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons.logging.version}</version> - </dependency> - <!-- Dependencies for login ui --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet-api.version}</version> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom.wso2</groupId> - <artifactId>axiom</artifactId> - <version>${axiom.wso2.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <log4j.version>1.2.17</log4j.version> - <commons.logging.version>1.1</commons.logging.version> - <opencsv.version>1.8</opencsv.version> - <poi.version>3.0-FINAL</poi.version> - <carbon.version>4.2.0</carbon.version> - <emma.version>2.1.5320</emma.version> - <carbon.kernel.version>4.2.0</carbon.kernel.version> - <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version> - <stratos.component.version>2.1.0</stratos.component.version> - <stratos.component.patch.version.2.1.1>2.1.1</stratos.component.patch.version.2.1.1> - <stratos.component.patch.version.2.1.3>2.1.3</stratos.component.patch.version.2.1.3> - <synapse.version>2.1.2-wso2v3</synapse.version> - <axis2.transport.version>1.1.0-wso2v6</axis2.transport.version> - <elb.version>2.0.5</elb.version> - <passthru.transport.version>1.0.2</passthru.transport.version> - <axis2.wso2.version>1.6.1.wso2v9</axis2.wso2.version> - <axiom.wso2.version>1.2.11.wso2v2</axiom.wso2.version> - <servlet-api.version>2.4</servlet-api.version> - <log4j.version>1.2.17</log4j.version> - <commons.logging.version>1.1</commons.logging.version> - </properties> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/pom.xml ---------------------------------------------------------------------- diff --git a/products/pom.xml b/products/pom.xml index ca02007..73e61fb 100644 --- a/products/pom.xml +++ b/products/pom.xml @@ -17,8 +17,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> <artifactId>stratos-parent</artifactId> @@ -33,11 +33,10 @@ <url>http://apache.org</url> <modules> - <module>python-cartridge-agent</module> + <module>python-cartridge-agent</module> <module>cartridge-agent</module> <module>stratos-cli</module> <module>load-balancer</module> <module>stratos</module> </modules> -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/python-cartridge-agent/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/distribution/pom.xml b/products/python-cartridge-agent/distribution/pom.xml index a7a36b3..77013f7 100644 --- a/products/python-cartridge-agent/distribution/pom.xml +++ b/products/python-cartridge-agent/distribution/pom.xml @@ -19,7 +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>python-cartridge-agent-parent</artifactId> @@ -27,55 +27,32 @@ <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>apache-stratos-python-cartridge-agent</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Python Cartridge Agent</name> - <url>http://apache.org</url> <description>Apache Stratos Python Cartridge Agent Distribution</description> <build> <plugins> - <!--plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> + <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>copy-source</id> - <phase>process-resources</phase> + <id>1-pre_dist</id> + <phase>test</phase> <goals> - <goal>run</goal> + <goal>attached</goal> </goals> <configuration> - <target> - <copy file="../../../components/org.apache.stratos.python.cartridge.agent/target/apache-stratos-python-cartridge-agent-${pom.version}.zip" - tofile="target/apache-stratos-python-cartridge-agent-${pom.version}.zip"/> - </target> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> - </plugin--> - - <plugin> - <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> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin> + </plugin> </plugins> </build> -</project> - +</project> \ No newline at end of file
