You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/11/03 09:23:58 UTC

[52/56] [abbrv] stratos git commit: Removing build xml file from metering dashboard capps

Removing build xml file from metering dashboard capps


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/774aebf1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/774aebf1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/774aebf1

Branch: refs/heads/stratos-4.1.x
Commit: 774aebf1ac65db151ccd127e5470f549f0262500
Parents: d81637a
Author: Thanuja <th...@wso2.com>
Authored: Thu Oct 22 13:36:35 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Nov 3 11:35:23 2015 +0530

----------------------------------------------------------------------
 .../metering-dashboard/capps/build.xml          | 40 --------------------
 .../artifacts/metering-dashboard/capps/pom.xml  | 10 +++--
 2 files changed, 6 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/774aebf1/extensions/das/modules/artifacts/metering-dashboard/capps/build.xml
----------------------------------------------------------------------
diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/build.xml b/extensions/das/modules/artifacts/metering-dashboard/capps/build.xml
deleted file mode 100644
index 185569c..0000000
--- a/extensions/das/modules/artifacts/metering-dashboard/capps/build.xml
+++ /dev/null
@@ -1,40 +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 name="stratos-metering-service" default="zip" basedir="">
-
-    <property name="project-name" value="${ant.project.name}"/>
-    <property name="target-dir" value="target"/>
-
-    <property name="stratos_metering_service_dir" value="stratos-metering-service"/>
-
-    <target name="clean">
-        <delete dir="${target-dir}"/>
-    </target>
-
-    <target name="zip" depends="clean">
-        <zip destfile="${target-dir}/${stratos_metering_service_dir}.car">
-            <zipfileset dir="${stratos_metering_service_dir}"/>
-        </zip>
-    </target>
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/774aebf1/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml b/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
index 8cde109..f110e22 100644
--- a/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
+++ b/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
@@ -24,7 +24,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.stratos</groupId>
-        <artifactId>stratos-das-extension</artifactId>
+        <artifactId>das-extension</artifactId>
         <version>4.1.5-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
@@ -57,9 +57,11 @@
                     <execution>
                         <phase>process-resources</phase>
                         <configuration>
-                            <target>
-                                <ant antfile="build.xml" target="zip"/>
-                            </target>
+                            <tasks>
+                                <zip destfile="target/stratos-metering-service.car">
+                                    <zipfileset dir="stratos-metering-service"/>
+                                </zip>
+                            </tasks>
                         </configuration>
                         <goals>
                             <goal>run</goal>