[Carbon-commits] [Carbon] svn commit r91844 - in trunk/carbon/components/csg: org.wso2.carbon.cloud.csg org.wso2.carbon.cloud.csg.agent.ui org.wso2.carbon.cloud.csg.agent.ui/src/main/java/org/wso2/carbon/cloud/csg/agent/ui org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/client org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/jms
rajika at wso2.com
rajika at wso2.com
Sun Apr 17 20:24:44 PDT 2011
Author: rajika
Date: Sun Apr 17 20:24:44 2011
New Revision: 91844
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=91844
Log:
Fixed the package structure.
Modified:
trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/pom.xml
trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/java/org/wso2/carbon/cloud/csg/agent/ui/CSGAgentAdminClient.java
trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/add-edit-csg-server.jsp
trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/delete-server.jsp
trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/extra-ui_ajaxprocessor.jsp
trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/index.jsp
trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/publish-service_ajaxprocessor.jsp
trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/save-csg-server.jsp
trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/client/CSGAdminClient.java
trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/jms/JMSServicePublisher.java
trunk/carbon/components/csg/org.wso2.carbon.cloud.csg/pom.xml
Modified: trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/pom.xml
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/pom.xml?rev=91844&r1=91843&r2=91844&view=diff
==============================================================================
--- trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/pom.xml (original)
+++ trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/pom.xml Sun Apr 17 20:24:44 2011
@@ -67,10 +67,10 @@
<Bundle-Name>${pom.artifactId}</Bundle-Name>
<Carbon-Component>UIBundle</Carbon-Component>
<Export-Package>
- org.wso2.carbon.cloud.csg.agent.ui.*,
+ org.wso2.carbon.cloud.csg.agent.ui.*;version="${carbon.platform.package.export.version}"
</Export-Package>
<Import-Package>
- org.wso2.carbon.cloud.csg.agent.stub.*;version="${carbon.platform.package.import.version.range}"
+ org.wso2.carbon.cloud.csg.agent.stub.*;version="${carbon.platform.package.import.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
Modified: trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/java/org/wso2/carbon/cloud/csg/agent/ui/CSGAgentAdminClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/java/org/wso2/carbon/cloud/csg/agent/ui/CSGAgentAdminClient.java?rev=91844&r1=91843&r2=91844&view=diff
==============================================================================
--- trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/java/org/wso2/carbon/cloud/csg/agent/ui/CSGAgentAdminClient.java (original)
+++ trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/java/org/wso2/carbon/cloud/csg/agent/ui/CSGAgentAdminClient.java Sun Apr 17 20:24:44 2011
@@ -20,7 +20,9 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.cloud.csg.agent.ui.types.carbon.CSGServerBean;
+import org.wso2.carbon.cloud.csg.agent.stub.CSGAgentAdminServiceStub;
+import org.wso2.carbon.cloud.csg.agent.stub.CSGException;
+import org.wso2.carbon.cloud.csg.agent.stub.types.carbon.CSGServerBean;
import java.rmi.RemoteException;
import java.util.Locale;
Modified: trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/add-edit-csg-server.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/add-edit-csg-server.jsp?rev=91844&r1=91843&r2=91844&view=diff
==============================================================================
--- trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/add-edit-csg-server.jsp (original)
+++ trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/add-edit-csg-server.jsp Sun Apr 17 20:24:44 2011
@@ -26,7 +26,7 @@
<%@ page import="org.apache.axis2.AxisFault" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
<%@ page import="java.util.ResourceBundle" %>
-<%@ page import="org.wso2.carbon.cloud.csg.agent.ui.types.carbon.CSGServerBean" %>
+<%@ page import="org.wso2.carbon.cloud.csg.agent.stub.types.carbon.CSGServerBean" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
Modified: trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/delete-server.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/delete-server.jsp?rev=91844&r1=91843&r2=91844&view=diff
==============================================================================
--- trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/delete-server.jsp (original)
+++ trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/delete-server.jsp Sun Apr 17 20:24:44 2011
@@ -28,7 +28,6 @@
<%@ page import="org.apache.axis2.AxisFault" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
<%@ page import="java.util.ResourceBundle" %>
-<%@ page import="org.wso2.carbon.cloud.csg.agent.ui.types.carbon.CSGServerBean" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
Modified: trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/extra-ui_ajaxprocessor.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/extra-ui_ajaxprocessor.jsp?rev=91844&r1=91843&r2=91844&view=diff
==============================================================================
--- trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/extra-ui_ajaxprocessor.jsp (original)
+++ trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/extra-ui_ajaxprocessor.jsp Sun Apr 17 20:24:44 2011
@@ -21,8 +21,8 @@
<%@ page import="org.wso2.carbon.CarbonConstants" %>
<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
<%@ page import="org.wso2.carbon.cloud.csg.agent.ui.CSGAgentAdminClient" %>
-<%@ page import="org.wso2.carbon.cloud.csg.agent.ui.types.carbon.CSGServerBean" %>
<%@ page import="org.apache.axis2.AxisFault" %>
+<%@ page import="org.wso2.carbon.cloud.csg.agent.stub.types.carbon.CSGServerBean" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
Modified: trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/index.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/index.jsp?rev=91844&r1=91843&r2=91844&view=diff
==============================================================================
--- trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/index.jsp (original)
+++ trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/index.jsp Sun Apr 17 20:24:44 2011
@@ -26,7 +26,7 @@
<%@ page import="org.apache.axis2.AxisFault" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
<%@ page import="java.util.ResourceBundle" %>
-<%@ page import="org.wso2.carbon.cloud.csg.agent.ui.types.carbon.CSGServerBean" %>
+<%@ page import="org.wso2.carbon.cloud.csg.agent.stub.types.carbon.CSGServerBean" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
Modified: trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/publish-service_ajaxprocessor.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/publish-service_ajaxprocessor.jsp?rev=91844&r1=91843&r2=91844&view=diff
==============================================================================
--- trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/publish-service_ajaxprocessor.jsp (original)
+++ trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/publish-service_ajaxprocessor.jsp Sun Apr 17 20:24:44 2011
@@ -26,7 +26,6 @@
<%@ page import="org.apache.axis2.AxisFault" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
<%@ page import="java.util.ResourceBundle" %>
-<%@ page import="org.wso2.carbon.cloud.csg.agent.ui.types.carbon.CSGServerBean" %>
<%@ page import="org.wso2.carbon.cloud.csg.common.CSGConstant" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
Modified: trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/save-csg-server.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/save-csg-server.jsp?rev=91844&r1=91843&r2=91844&view=diff
==============================================================================
--- trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/save-csg-server.jsp (original)
+++ trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent.ui/src/main/resources/web/csg/save-csg-server.jsp Sun Apr 17 20:24:44 2011
@@ -25,8 +25,8 @@
<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
<%@ page import="org.wso2.carbon.cloud.csg.agent.ui.CSGAgentAdminClient" %>
-<%@ page import="org.wso2.carbon.cloud.csg.agent.ui.types.carbon.CSGServerBean" %>
<%@ page import="java.text.MessageFormat" %>
+<%@ page import="org.wso2.carbon.cloud.csg.agent.stub.types.carbon.CSGServerBean" %>
<%
String hostName = request.getParameter("csg_host_name_id");
Modified: trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/client/CSGAdminClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/client/CSGAdminClient.java?rev=91844&r1=91843&r2=91844&view=diff
==============================================================================
--- trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/client/CSGAdminClient.java (original)
+++ trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/client/CSGAdminClient.java Sun Apr 17 20:24:44 2011
@@ -21,7 +21,9 @@
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.cloud.csg.agent.client.types.common.ServiceMetaData;
+import org.wso2.carbon.cloud.csg.stub.CSGAdminServiceStub;
+import org.wso2.carbon.cloud.csg.stub.CSGException;
+import org.wso2.carbon.cloud.csg.stub.types.common.ServiceMetaData;
import java.rmi.RemoteException;
import java.util.Locale;
Modified: trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/jms/JMSServicePublisher.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/jms/JMSServicePublisher.java?rev=91844&r1=91843&r2=91844&view=diff
==============================================================================
--- trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/jms/JMSServicePublisher.java (original)
+++ trunk/carbon/components/csg/org.wso2.carbon.cloud.csg.agent/src/main/java/org/wso2/carbon/cloud/csg/agent/jms/JMSServicePublisher.java Sun Apr 17 20:24:44 2011
@@ -28,11 +28,11 @@
import org.wso2.carbon.cloud.csg.agent.CSGAgentUtils;
import org.wso2.carbon.cloud.csg.agent.CSGServicePublisher;
import org.wso2.carbon.cloud.csg.agent.client.CSGAdminClient;
-import org.wso2.carbon.cloud.csg.agent.client.types.common.ServiceMetaData;
import org.wso2.carbon.cloud.csg.common.CSGCommonUtils;
import org.wso2.carbon.cloud.csg.common.CSGConstant;
import org.wso2.carbon.cloud.csg.common.CSGException;
import org.wso2.carbon.cloud.csg.common.CSGServerBean;
+import org.wso2.carbon.cloud.csg.stub.types.common.ServiceMetaData;
import org.wso2.carbon.core.AbstractAdmin;
import org.wso2.carbon.core.multitenancy.SuperTenantCarbonContext;
import org.wso2.carbon.core.persistence.ServicePersistenceManager;
Modified: trunk/carbon/components/csg/org.wso2.carbon.cloud.csg/pom.xml
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/csg/org.wso2.carbon.cloud.csg/pom.xml?rev=91844&r1=91843&r2=91844&view=diff
==============================================================================
--- trunk/carbon/components/csg/org.wso2.carbon.cloud.csg/pom.xml (original)
+++ trunk/carbon/components/csg/org.wso2.carbon.cloud.csg/pom.xml Sun Apr 17 20:24:44 2011
@@ -83,6 +83,7 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${pom.artifactId}</Bundle-Name>
+ <Private-Package>org.wso2.carbon.cloud.csg.internal</Private-Package>
<Export-Package>
org.wso2.carbon.cloud.csg.*,
</Export-Package>
More information about the Carbon-commits
mailing list