You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/07/05 12:32:51 UTC
[14/34] git commit: committing adc.mgt component changes
committing adc.mgt component changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d4f09bba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d4f09bba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d4f09bba
Branch: refs/heads/master
Commit: d4f09bba0d4859bb7a71a5165d0efe667cd9c3ef
Parents: 4f21785
Author: Isuru <is...@wso2.com>
Authored: Fri Jul 5 13:32:23 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Jul 5 13:32:23 2013 +0530
----------------------------------------------------------------------
.../2.1.1/pom.xml | 6 +++---
.../stratos/adc/mgt/internal/DataHolder.java | 2 +-
.../adc/mgt/utils/ApplicationManagementUtil.java | 8 ++++----
.../org.wso2.carbon.adc.mgt.cli/2.1.3/pom.xml | 19 ++++++++++---------
components/pom.xml | 1 +
5 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4f09bba/components/org.apache.stratos.adc.mgt.repository.synchronizer/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt.repository.synchronizer/2.1.1/pom.xml b/components/org.apache.stratos.adc.mgt.repository.synchronizer/2.1.1/pom.xml
index 6f0f4a6..10d8467 100644
--- a/components/org.apache.stratos.adc.mgt.repository.synchronizer/2.1.1/pom.xml
+++ b/components/org.apache.stratos.adc.mgt.repository.synchronizer/2.1.1/pom.xml
@@ -19,9 +19,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>adc-mgt</artifactId>
- <version>2.1.0</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-components-parent</artifactId>
+ <version>2.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4f09bba/components/org.apache.stratos.adc.mgt/2.1.3/src/main/java/org/apache/stratos/adc/mgt/internal/DataHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/2.1.3/src/main/java/org/apache/stratos/adc/mgt/internal/DataHolder.java b/components/org.apache.stratos.adc.mgt/2.1.3/src/main/java/org/apache/stratos/adc/mgt/internal/DataHolder.java
index 2d810cf..392489b 100644
--- a/components/org.apache.stratos.adc.mgt/2.1.3/src/main/java/org/apache/stratos/adc/mgt/internal/DataHolder.java
+++ b/components/org.apache.stratos.adc.mgt/2.1.3/src/main/java/org/apache/stratos/adc/mgt/internal/DataHolder.java
@@ -18,7 +18,7 @@ package org.apache.stratos.adc.mgt.internal;
import org.apache.axis2.context.ConfigurationContext;
import org.wso2.carbon.registry.core.Registry;
-import org.wso2.carbon.adc.topology.mgt.service.TopologyManagementService;
+import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService;
import org.wso2.carbon.user.core.service.RealmService;
import org.wso2.carbon.utils.CarbonUtils;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4f09bba/components/org.apache.stratos.adc.mgt/2.1.3/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/2.1.3/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java b/components/org.apache.stratos.adc.mgt/2.1.3/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java
index 12c69a9..a83a5c9 100644
--- a/components/org.apache.stratos.adc.mgt/2.1.3/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java
+++ b/components/org.apache.stratos.adc.mgt/2.1.3/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java
@@ -457,8 +457,8 @@ public class ApplicationManagementUtil {
private static String createPortMappingPayloadString(CartridgeInfo cartridgeInfo) {
// port mappings
StringBuilder portMapBuilder = new StringBuilder();
- org.wso2.carbon.stratos.cloud.controller.util.xsd.PortMapping[] portMappings = cartridgeInfo.getPortMappings();
- for (org.wso2.carbon.stratos.cloud.controller.util.xsd.PortMapping portMapping : portMappings) {
+ org.apache.stratos.cloud.controller.util.xsd.PortMapping[] portMappings = cartridgeInfo.getPortMappings();
+ for (org.apache.stratos.cloud.controller.util.xsd.PortMapping portMapping : portMappings) {
String port = portMapping.getPort();
String protocol = portMapping.getProtocol();
String proxyPort = portMapping.getProxyPort();
@@ -587,7 +587,7 @@ public class ApplicationManagementUtil {
List<PortMapping> portMappings = new ArrayList<PortMapping>();
if (cartridgeInfo.getPortMappings() != null) {
- for (org.wso2.carbon.stratos.cloud.controller.util.xsd.PortMapping portMapping : cartridgeInfo.getPortMappings()) {
+ for (org.apache.stratos.cloud.controller.util.xsd.PortMapping portMapping : cartridgeInfo.getPortMappings()) {
PortMapping portMap = new PortMapping();
portMap.setPrimaryPort(portMapping.getPort());
portMap.setProxyPort(portMapping.getProxyPort());
@@ -1013,7 +1013,7 @@ public class ApplicationManagementUtil {
List<String> accessURLs = new ArrayList<String>();
if (cartridgeInfo.getPortMappings() != null) {
- for (org.wso2.carbon.stratos.cloud.controller.util.xsd.PortMapping portMapping : cartridgeInfo
+ for (org.apache.stratos.cloud.controller.util.xsd.PortMapping portMapping : cartridgeInfo
.getPortMappings()) {
if (portMapping != null) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4f09bba/components/org.wso2.carbon.adc.mgt.cli/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.wso2.carbon.adc.mgt.cli/2.1.3/pom.xml b/components/org.wso2.carbon.adc.mgt.cli/2.1.3/pom.xml
index 5396a74..44c27ce 100644
--- a/components/org.wso2.carbon.adc.mgt.cli/2.1.3/pom.xml
+++ b/components/org.wso2.carbon.adc.mgt.cli/2.1.3/pom.xml
@@ -12,19 +12,19 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>adc-mgt</artifactId>
- <version>2.1.0</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-components-parent</artifactId>
+ <version>2.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.adc.mgt.cli</artifactId>
+ <artifactId>org.apache.stratos.adc.mgt.cli</artifactId>
<version>2.1.3</version>
<packaging>jar</packaging>
- <name>WSO2 Carbon - ADC Management CLI</name>
+ <name>Apache Stratos - ADC Management CLI</name>
<description>ADC management CLI bundle</description>
- <url>http://wso2.org</url>
+ <url>http://apache.org</url>
<properties>
<slf4j.version>1.7.5</slf4j.version>
@@ -39,6 +39,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.securevault</groupId>
@@ -51,8 +52,8 @@
<version>4.1.0-wso2v1</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.adc.mgt.stub</artifactId>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.adc.mgt.stub</artifactId>
<version>4.1.3</version>
</dependency>
<dependency>
@@ -101,7 +102,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>org.wso2.carbon.adc.mgt.cli.CliTool</mainClass>
+ <mainClass>org.apache.stratos.adc.mgt.cli.CliTool</mainClass>
</manifest>
</archive>
<descriptors>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4f09bba/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index a44906b..f468500 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -194,6 +194,7 @@
<axis2.kernel.version>1.6.1-wso2v9</axis2.kernel.version>
<orbit.version.geronimo-jms_1.1_spec>1.1.0.wso2v1</orbit.version.geronimo-jms_1.1_spec>
<google.guice.wso2.version>3.0.wso2v1</google.guice.wso2.version>
+ <commons-httpclient.version>3.0.1</commons-httpclient.version>
<!--eclipse.osgi.version>3.5.0.v20090520</eclipse.osgi.version>
<eclipse.osgi.services.version>3.2.0.v20090520-1800</eclipse.osgi.services.version>
<equinox.commons.logging.version>1.0.4.v200706111724</equinox.commons.logging.version>