Updated Branches: refs/heads/master a6d73412f -> 7a8d63ec5
Removed duplicate dependency in validate domain stub, stratos controller - distribution module and formatted code Signed-off-by: Lakmal Warusawithana <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7a8d63ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7a8d63ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7a8d63ec Branch: refs/heads/master Commit: 7a8d63ec56632b3f2afc0cdeb3f3a0e59c22a062 Parents: a6d7341 Author: Imesh Gunaratne <[email protected]> Authored: Tue Jul 23 09:46:20 2013 +0530 Committer: Lakmal Warusawithana <[email protected]> Committed: Tue Jul 23 10:23:06 2013 +0530 ---------------------------------------------------------------------- .../modules/distribution/pom.xml | 79 ++++++++++---------- .../pom.xml | 71 +++++++++--------- 2 files changed, 74 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7a8d63ec/products/stratos_controller/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos_controller/modules/distribution/pom.xml b/products/stratos_controller/modules/distribution/pom.xml index 1645044..0b85ca5 100755 --- a/products/stratos_controller/modules/distribution/pom.xml +++ b/products/stratos_controller/modules/distribution/pom.xml @@ -21,16 +21,16 @@ 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-controller-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <groupId>org.apache.stratos</groupId> + <artifactId>stratos-controller-parent</artifactId> + <version>3.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wso2sc</artifactId> <packaging>jar</packaging> - <name>Apache Stratos2 - Distribution</name> + <name>Apache Stratos2 - Distribution</name> <description>Apache Stratos2 - Distribution</description> <dependencies> @@ -40,24 +40,24 @@ <version>${rampart.mar.version}</version> <type>mar</type> </dependency> - <dependency> + <dependency> <groupId>org.wso2.andes.wso2</groupId> <artifactId>andes-client</artifactId> <version>0.13.wso2v6</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>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 --> + <!-- Carbon core distribution --> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>wso2carbon-core</artifactId> @@ -108,13 +108,13 @@ <artifactId>org.wso2.carbon.mediator.bridge</artifactId> <version>${carbon.version}</version> </dependency> - <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> @@ -174,15 +174,15 @@ <artifactId>org.wso2.carbon.mediator.command.services</artifactId> <version>${carbon.version}</version> </dependency> - - <!--Entitlement mediator 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 --> + + <!--OAuth mediator dependency --> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.identity.oauth.mediator</artifactId> @@ -221,11 +221,11 @@ <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.common</artifactId> + <version>${carbon.version}</version> + </dependency--> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.endpoint</artifactId> @@ -256,7 +256,7 @@ <version>${carbon.version}</version> </dependency> <!-- Security components (orbit) --> - <dependency> + <dependency> <groupId>org.apache.rampart.wso2</groupId> <artifactId>rampart-policy</artifactId> <version>1.6.1.wso2v1</version> @@ -274,13 +274,6 @@ <version>1.6.1.wso2v1</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> @@ -339,7 +332,7 @@ <artifactId>org.wso2.carbon.rm</artifactId> <version>${carbon.version}</version> </dependency> - + <!-- Menus --> <dependency> <groupId>org.wso2.carbon</groupId> @@ -430,13 +423,13 @@ <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> </dependency> - + <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.relay</artifactId> @@ -531,7 +524,7 @@ <path refid="h2.classpath"/> </classpath> <fileset file="../../billing-script/billing-h2.sql"/> - <fileset file="../../billing-script/metering_h2.sql"/> + <fileset file="../../billing-script/metering_h2.sql"/> </sql> <echo message="##################### END ########################"/> @@ -560,7 +553,7 @@ <classpath> <path refid="h2.classpath"/> </classpath> - <fileset file="../../billing-script/s2_h2.sql"/> + <fileset file="../../billing-script/s2_h2.sql"/> </sql> <echo message="##################### END ########################"/> @@ -582,11 +575,14 @@ <include name="${project.artifactId}-${project.version}.zip"/> </fileset> </unzip> - <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" overwrite="true"> - <fileset dir="${tempdir}/${project.artifactId}-${project.version}/repository/components"> + <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" + overwrite="true"> + <fileset + dir="${tempdir}/${project.artifactId}-${project.version}/repository/components"> </fileset> </copy> - <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf" overwrite="true"> + <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf" + overwrite="true"> <fileset dir="../../conf"> <include name="user-mgt.xml"/> </fileset> @@ -595,7 +591,8 @@ <delete dir="${tempdir}"/> <mkdir dir="${tempdir}"/> <unzip dest="${tempdir}"> - <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/"> + <fileset + dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/"> <include name="*.ui*.jar"/> </fileset> </unzip> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7a8d63ec/service-stubs/org.apache.stratos.validate.domain.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.validate.domain.stub/pom.xml b/service-stubs/org.apache.stratos.validate.domain.stub/pom.xml index 606dbef..2ed1741 100644 --- a/service-stubs/org.apache.stratos.validate.domain.stub/pom.xml +++ b/service-stubs/org.apache.stratos.validate.domain.stub/pom.xml @@ -17,7 +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> @@ -33,8 +34,8 @@ <build> <plugins> - - <plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.1</version> @@ -47,11 +48,14 @@ </goals> <configuration> <tasks> -<path id="wsdl2java.classpath"> + <path id="wsdl2java.classpath"> <!-- <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar"/>--> - <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/1.2.11.wso2v4/axiom-1.2.11.wso2v4.jar"/> - <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar"/> - <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar"/> + <pathelement + location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/1.2.11.wso2v4/axiom-1.2.11.wso2v4.jar"/> + <pathelement + location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar"/> + <pathelement + location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar"/> </path> <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> @@ -61,7 +65,7 @@ <!--<classpath refid="maven.dependency.classpath"/> <classpath refid="maven.compile.classpath"/> <classpath refid="maven.runtime.classpath"/>--> - <classpath refid="wsdl2java.classpath"/> + <classpath refid="wsdl2java.classpath"/> </java> <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> <arg line="-uri src/main/resources/ValidateDomainAdminService.wsdl -u -uw -o target/generated-code @@ -70,25 +74,26 @@ <!--<classpath refid="maven.dependency.classpath"/> <classpath refid="maven.compile.classpath"/> <classpath refid="maven.runtime.classpath"/>--> - <classpath refid="wsdl2java.classpath"/> + <classpath refid="wsdl2java.classpath"/> </java> </tasks> </configuration> </execution> </executions> </plugin> - + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - + <extensions>true</extensions> <configuration> <instructions> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Name>${project.artifactId}</Bundle-Name> <Export-Package> - org.apache.stratos.validate.domain.stub.*; version="${carbon.platform.package.export.version}" + org.apache.stratos.validate.domain.stub.*; + version="${carbon.platform.package.export.version}" </Export-Package> <Import-Package> !org.apache.stratos.validate.domain.stub.*, @@ -126,33 +131,29 @@ <groupId>org.apache.axis2.wso2</groupId> <artifactId>axis2</artifactId> </dependency> - <dependency> + <dependency> + <groupId>wsdl4j.wso2</groupId> + <artifactId>wsdl4j</artifactId> + <version>1.6.2.wso2v4</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.schema.wso2</groupId> + <artifactId>XmlSchema</artifactId> + <version>${xmlschema.wso2.version}</version> + </dependency> + <dependency> <groupId>org.apache.ws.commons.axiom.wso2</groupId> <artifactId>axiom</artifactId> - </dependency> - <dependency> - <groupId>wsdl4j.wso2</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.2.wso2v4</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.schema.wso2</groupId> - <artifactId>XmlSchema</artifactId> - <version>${xmlschema.wso2.version}</version> - </dependency> -<dependency> - <groupId>org.apache.ws.commons.axiom.wso2</groupId> - <artifactId>axiom</artifactId> - <version>${orbit.version.axiom}</version> - </dependency> + <version>${orbit.version.axiom}</version> + </dependency> </dependencies> <properties> - <orbit.version.axiom>1.2.11.wso2v3</orbit.version.axiom> + <orbit.version.axiom>1.2.11.wso2v3</orbit.version.axiom> </properties> </project>
