Hi,
The gauges stub and related component/features were fixed. It builds without
compilation errors up to features.
But since there were ambiguous imports in ui component and the resolving of
imports were done without the context knowledge, i did not commit it. All
the relevant diff files are attached here with.
It would be great if the product team/s who uses this gauges
component/feature, could please apply them and verify and commit.
Thanks,
Hasini.
On Tue, Mar 29, 2011 at 6:14 PM, Hasini Gunasinghe <has...@wso2.com> wrote:
> Hi,
>
> Can someone please confirm which product uses the gauges ui component and
> hence the gauges stub? I checked with BAM and G-Reg. But it is not much
> clear which product/s exactly uses it.
>
> Thanks,
> Hasini.
>
> On Tue, Mar 29, 2011 at 2:44 PM, Hasini Gunasinghe <has...@wso2.com>wrote:
>
>>
>>
>> On Tue, Mar 29, 2011 at 12:48 PM, Samisa Abeysinghe <sam...@wso2.com>wrote:
>>
>>> I see that we are almost done, but not yet there.
>>>
>>> Please make sure to update this thread, if it is going to take more time
>>> than EOD today.
>>>
>>> Hi,
>>
>> Just to update...
>>
>> We have completed the sub migration of the components related to IS.
>>
>> There are few stubs used by other products, assigned to us as follows:
>>
>> ec2-client
>> email-verification
>> gauges
>>
>
>> We will work on fixing them too before EOD today. Please let us know if
>> any of you are already working on them or have done them already.
>>
>> Thanks,
>> Hasini.
>>
>>
>>> On Mon, Mar 28, 2011 at 10:37 PM, Kalpanie Wanigaratne <
>>> kalpa...@wso2.com> wrote:
>>>
>>>>
>>>>
>>>> On Mon, Mar 28, 2011 at 2:13 PM, Afkham Azeez <az...@wso2.com> wrote:
>>>>
>>>>> Some people who are yet to finish the stub work are;
>>>>> SupunM
>>>>> HasiniG
>>>>> Shariq
>>>>> KasunW
>>>>> Kalpanie - Doesn't use any stubs. Updated the document.
>>>>>
>>>>
>>>> Regards
>>>>
>>>> Kalpanie
>>>>
>>>>
>>>>
>>>>
>>>>> Asela
>>>>> HasiniY
>>>>>
>>>>>
>>>>> On Mon, Mar 28, 2011 at 2:10 PM, Afkham Azeez <az...@wso2.com> wrote:
>>>>>
>>>>>> Many of these have still not been fixed.
>>>>>>
>>>>>> See
>>>>>> https://spreadsheets.google.com/a/wso2.com/ccc?key=0AvlG3My7KaUCdGFIYnpvdjN6cm5ySWNQRWx6U0ozYnc&hl=en&pli=1#gid=0
>>>>>>
>>>>>> On Mon, Mar 28, 2011 at 12:30 PM, Samisa Abeysinghe
>>>>>> <sam...@wso2.com>wrote:
>>>>>>
>>>>>>> Why do we still see code generation when building components?
>>>>>>>
>>>>>>> [INFO]
>>>>>>> ------------------------------------------------------------------------
>>>>>>> [INFO] Building WSO2 Carbon - Registry - Web Service Client
>>>>>>> [INFO] task-segment: [clean, install]
>>>>>>> [INFO]
>>>>>>> ------------------------------------------------------------------------
>>>>>>> [INFO] [clean:clean {execution: default-clean}]
>>>>>>> [INFO] Deleting directory
>>>>>>> D:\svn\carbon\components\registry\org.wso2.carbon.registry.ws.client\target
>>>>>>> [INFO] snapshot
>>>>>>> org.wso2.carbon:org.wso2.carbon.registry.common.ui:3.2.0-SNAPSHOT:
>>>>>>> checking
>>>>>>> for updates from wso2-nexus
>>>>>>> [INFO] snapshot
>>>>>>> org.wso2.carbon:org.wso2.carbon.registry.extensions:3.2.0-SNAPSHOT:
>>>>>>> checking
>>>>>>> for updates from wso2-nexus
>>>>>>> [INFO] [incremental-build:incremental-build {execution: default}]
>>>>>>> [INFO] Verifying module descriptor ...
>>>>>>> [INFO] Pom descriptor modification detected.
>>>>>>> [INFO] Deleting
>>>>>>> D:\svn\carbon\components\registry\org.wso2.carbon.registry.ws.client\target
>>>>>>> [INFO] [build-helper:add-source {execution: add-source}]
>>>>>>> [INFO] Source directory:
>>>>>>> D:\svn\carbon\components\registry\org.wso2.carbon.registry.ws.client\target\generated-code\src
>>>>>>> added.
>>>>>>> [INFO] [resources:resources {execution: default-resources}]
>>>>>>> [INFO] Using 'UTF-8' encoding to copy filtered resources.
>>>>>>> [INFO] Copying 1 resource
>>>>>>> *[INFO] [antrun:run {execution: source-code-generation}]*
>>>>>>> [INFO] Executing tasks
>>>>>>> [java] Retrieving document at
>>>>>>> 'src/main/resources/WSRegistryService/WSRegistryService.wsdl'.
>>>>>>> [java] Mar 28, 2011 12:28:22 PM
>>>>>>> org.apache.axis2.schema.SchemaCompiler compile
>>>>>>> [java] WARNING: No schemaLocation for import of
>>>>>>> http://api.registry.carbon.wso2.org/xsd; compilation may fail
>>>>>>> [java] Mar 28, 2011 12:28:22 PM
>>>>>>> org.apache.axis2.schema.SchemaCompiler compile
>>>>>>> [java] WARNING: No schemaLocation for import of
>>>>>>> http://exceptions.core.registry.carbon.wso2.org/xsd; compilation may
>>>>>>> fail
>>>>>>> [java] Mar 28, 2011 12:28:22 PM
>>>>>>> org.apache.axis2.schema.SchemaCompiler compile
>>>>>>> [java] WARNING: No schemaLocation for import of
>>>>>>> http://api.ws.registry.carbon.wso2.org/xsd; compilation may fail
>>>>>>> [java] Mar 28, 2011 12:28:22 PM
>>>>>>> org.apache.axis2.schema.SchemaCompiler compile
>>>>>>> [java] WARNING: No schemaLocation for import of
>>>>>>> http://io.java/xsd; compilation may fail
>>>>>>> [java] Mar 28, 2011 12:28:22 PM
>>>>>>> org.apache.axis2.schema.SchemaCompiler findClassName
>>>>>>> [java] WARNING: Type {
>>>>>>> http://api.registry.carbon.wso2.org/xsd}RegistryException missing!
>>>>>>> [INFO] Executed tasks
>>>>>>> [INFO] [compiler:compile {execution: default-compile}]
>>>>>>>
>>>>>>> Thanks,
>>>>>>> Samisa...
>>>>>>>
>>>>>>> Samisa Abeysinghe
>>>>>>> VP Engineering
>>>>>>> WSO2 Inc.
>>>>>>> http://wso2.com
>>>>>>> http://wso2.org
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> _______________________________________________
>>>>>>> Carbon-dev mailing list
>>>>>>> Carbon-dev@wso2.org
>>>>>>> http://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev
>>>>>>>
>>>>>>>
>>>>>>
>>>>>>
>>>>>> --
>>>>>> *Afkham Azeez*
>>>>>> Senior Software Architect & Senior Manager; WSO2, Inc.;
>>>>>> http://wso2.com,
>>>>>> *
>>>>>> *
>>>>>> *Member; Apache Software Foundation;
>>>>>> **http://www.apache.org/*<http://www.apache.org/>
>>>>>> *
>>>>>> email: **az...@wso2.com* <az...@wso2.com>* cell: +94 77 3320919
>>>>>> blog: **http://blog.afkham.org* <http://blog.afkham.org>*
>>>>>> twitter:
>>>>>> **http://twitter.com/afkham_azeez*<http://twitter.com/afkham_azeez>
>>>>>> *
>>>>>> linked-in: **http://lk.linkedin.com/in/afkhamazeez*
>>>>>> *
>>>>>> *
>>>>>> *Lean . Enterprise . Middleware*
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> *Afkham Azeez*
>>>>> Senior Software Architect & Senior Manager; WSO2, Inc.;
>>>>> http://wso2.com,
>>>>> *
>>>>> *
>>>>> *Member; Apache Software Foundation;
>>>>> **http://www.apache.org/*<http://www.apache.org/>
>>>>> *
>>>>> email: **az...@wso2.com* <az...@wso2.com>* cell: +94 77 3320919
>>>>> blog: **http://blog.afkham.org* <http://blog.afkham.org>*
>>>>> twitter:
>>>>> **http://twitter.com/afkham_azeez*<http://twitter.com/afkham_azeez>
>>>>> *
>>>>> linked-in: **http://lk.linkedin.com/in/afkhamazeez*
>>>>> *
>>>>> *
>>>>> *Lean . Enterprise . Middleware*
>>>>>
>>>>>
>>>> Thanks,
>>> Samisa...
>>>
>>> Samisa Abeysinghe
>>> VP Engineering
>>> WSO2 Inc.
>>> http://wso2.com
>>> http://wso2.org
>>>
>>>
>>>
>>>
>>
>
Index: org.wso2.carbon.gauges.stub/pom.xml
===================================================================
--- org.wso2.carbon.gauges.stub/pom.xml (revision 91133)
+++ org.wso2.carbon.gauges.stub/pom.xml (working copy)
@@ -16,7 +16,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";>
<parent>
<groupId>org.wso2.carbon</groupId>
@@ -26,14 +28,32 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.gauges.stub</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>WSO2 Carbon - Gauges Stub</name>
<url>http://wso2.org</url>
<build>
<plugins>
-
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${pom.artifactId}</Bundle-Name>
+ <Export-Package>
+ org.wso2.carbon.gauges.stub.*;
+ version="${carbon.platform.package.export.version}"
+ </Export-Package>
+ <Import-Package>
+ !org.wso2.carbon.gauges.stub.*
+ </Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
@@ -47,37 +67,39 @@
<configuration>
<tasks>
<path id="wsdl2java.classpath">
- <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${orbit.version.axis2}/axis2-client-${orbit.version.axis2}.jar"/>
- <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${orbit.version.axis2}/axis2-${orbit.version.axis2}.jar"/>
+ <pathelement
+ location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${orbit.version.axis2}/axis2-client-${orbit.version.axis2}.jar"/>
+ <pathelement
+ location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${orbit.version.axis2}/axis2-${orbit.version.axis2}.jar"/>
</path>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<arg line="-uri src/main/resources/GadgetSourceService.wsdl -u -uw
- -o target/generated-code -p org.wso2.carbon.gauges.ui
- -ns2p http://utils.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://util.java/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://gauges.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://org.apache.axis2/xsd=org.wso2.carbon.gauges.ui.types.axis2,http://neethi.apache.org/xsd=org.wso2.carbon.gauges.ui.types.neethi,http://services.gadgetsource.governance.carbon.wso2.org=org.wso2.carbon.gauges.ui.governance.gadgetsource.services,http://beans.gadgetsource.governance.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.governance.gadgetsource.beans.xsd,http://exceptions.core.registry.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.registry.core.exceptions"/>
+ -o target/generated-code -p org.wso2.carbon.gauges.stub
+ -ns2p http://utils.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://util.java/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://gauges.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://org.apache.axis2/xsd=org.wso2.carbon.gauges.stub.types.axis2,http://neethi.apache.org/xsd=org.wso2.carbon.gauges.stub.types.neethi,http://services.gadgetsource.governance.carbon.wso2.org=org.wso2.carbon.gauges.stub.governance.gadgetsource.services,http://beans.gadgetsource.governance.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.governance.gadgetsource.beans.xsd,http://exceptions.core.registry.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.registry.core.exceptions"/>
<classpath refid="wsdl2java.classpath"/>
</java>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<arg line="-uri src/main/resources/BAMStatQueryDS.wsdl -u -uw
- -o target/generated-code -p org.wso2.carbon.gauges.ui
- -ns2p http://utils.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://util.java/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://gauges.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://org.apache.axis2/xsd=org.wso2.carbon.gauges.ui.types.axis2,http://neethi.apache.org/xsd=org.wso2.carbon.gauges.ui.types.neethi"/>
+ -o target/generated-code -p org.wso2.carbon.gauges.stub
+ -ns2p http://utils.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://util.java/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://gauges.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://org.apache.axis2/xsd=org.wso2.carbon.gauges.stub.types.axis2,http://neethi.apache.org/xsd=org.wso2.carbon.gauges.stub.types.neethi"/>
<classpath refid="wsdl2java.classpath"/>
</java>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<arg line="-uri src/main/resources/BAMListAdminService.wsdl -u -uw
- -o target/generated-code -p org.wso2.carbon.gauges.ui
- -ns2p http://dto.mgt.bam.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://utils.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://util.java/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://gauges.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://org.apache.axis2/xsd=org.wso2.carbon.gauges.ui.types.axis2,http://neethi.apache.org/xsd=org.wso2.carbon.gauges.ui.types.neethi"/>
+ -o target/generated-code -p org.wso2.carbon.gauges.stub
+ -ns2p http://dto.mgt.bam.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://utils.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://util.java/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://gauges.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://org.apache.axis2/xsd=org.wso2.carbon.gauges.stub.types.axis2,http://neethi.apache.org/xsd=org.wso2.carbon.gauges.stub.types.neethi"/>
<classpath refid="wsdl2java.classpath"/>
</java>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<arg line="-uri src/main/resources/GovImpactAnalysisAdminService.wsdl -u -uw
- -o target/generated-code -p org.wso2.carbon.gauges.ui
- -ns2p http://utils.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://util.java/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://gauges.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://exception.api.governance.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.governance.api.exception.xsd,http://beans.impactanalysis.gadgets.governance.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.governance.gadgets.impactanalysis.beans.xsd,http://org.apache.axis2/xsd=org.wso2.carbon.gauges.ui.types.axis2,http://neethi.apache.org/xsd=org.wso2.carbon.gauges.ui.types.neethi"/>
+ -o target/generated-code -p org.wso2.carbon.gauges.stub
+ -ns2p http://utils.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://util.java/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://gauges.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://exception.api.governance.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.governance.api.exception.xsd,http://beans.impactanalysis.gadgets.governance.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.governance.gadgets.impactanalysis.beans.xsd,http://org.apache.axis2/xsd=org.wso2.carbon.gauges.stub.types.axis2,http://neethi.apache.org/xsd=org.wso2.carbon.gauges.stub.types.neethi"/>
<classpath refid="wsdl2java.classpath"/>
</java>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<arg line="-uri src/main/resources/ResourceImpactAdminService.wsdl -u -uw
- -o target/generated-code -p org.wso2.carbon.gauges.ui
- -ns2p http://utils.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://util.java/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://gauges.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.types.carbon,http://services.resourceimpact.gadgets.governance.carbon.wso2.org=org.wso2.carbon.gauges.ui.governance.gadgets.resourceimpact.services,http://exceptions.core.registry.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.registry.core.exceptions,http://core.registry.carbon.wso2.org/xsd=org.wso2.carbon.gauges.ui.registry.core.xsd,http://org.apache.axis2/xsd=org.wso2.carbon.gauges.ui.types.axis2"/>
+ -o target/generated-code -p org.wso2.carbon.gauges.stub
+ -ns2p http://utils.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://util.java/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://gauges.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.types.carbon,http://services.resourceimpact.gadgets.governance.carbon.wso2.org=org.wso2.carbon.gauges.stub.governance.gadgets.resourceimpact.services,http://exceptions.core.registry.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.registry.core.exceptions,http://core.registry.carbon.wso2.org/xsd=org.wso2.carbon.gauges.stub.registry.core.xsd,http://org.apache.axis2/xsd=org.wso2.carbon.gauges.stub.types.axis2"/>
<classpath refid="wsdl2java.classpath"/>
</java>
</tasks>
Index: org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GovImpactAdminServiceClient.java
===================================================================
--- org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GovImpactAdminServiceClient.java (revision 91155)
+++ org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GovImpactAdminServiceClient.java (working copy)
@@ -30,7 +30,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.CarbonConstants;
-import org.wso2.carbon.gauges.ui.governance.gadgets.impactanalysis.beans.xsd.ImpactBean;
+import org.wso2.carbon.gauges.stub.GovImpactAnalysisAdminServiceStub;
+import org.wso2.carbon.gauges.stub.GovernanceException;
+import org.wso2.carbon.gauges.stub.governance.gadgets.impactanalysis.beans.xsd.ImpactBean;
import org.wso2.carbon.ui.CarbonUIUtil;
import org.wso2.carbon.utils.ServerConstants;
Index: org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/ResourceImpactDataProcesssor.java
===================================================================
--- org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/ResourceImpactDataProcesssor.java (revision 91155)
+++ org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/ResourceImpactDataProcesssor.java (working copy)
@@ -26,8 +26,9 @@
import javax.servlet.http.HttpSession;
import org.apache.axis2.AxisFault;
+import org.wso2.carbon.gauges.stub.RegistryException;
import org.wso2.carbon.gauges.ui.beans.AssociationBean;
-import org.wso2.carbon.gauges.ui.registry.core.xsd.Association;
+import org.wso2.carbon.gauges.stub.registry.core.xsd.Association;
public class ResourceImpactDataProcesssor {
Index: org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/BAMDataServiceDataProcessor.java
===================================================================
--- org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/BAMDataServiceDataProcessor.java (revision 91155)
+++ org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/BAMDataServiceDataProcessor.java (working copy)
@@ -23,10 +23,10 @@
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.CarbonConstants;
import org.wso2.carbon.bam.*;
-import org.wso2.carbon.gauges.ui.types.carbon.ActivityDTO;
-import org.wso2.carbon.gauges.ui.types.carbon.MessageDTO;
-import org.wso2.carbon.gauges.ui.types.carbon.MonitoredServerDTO;
-import org.wso2.carbon.gauges.ui.types.carbon.ServiceDTO;
+import org.wso2.carbon.gauges.stub.types.carbon.ActivityDTO;
+import org.wso2.carbon.gauges.stub.types.carbon.MessageDTO;
+import org.wso2.carbon.gauges.stub.types.carbon.MonitoredServerDTO;
+import org.wso2.carbon.gauges.stub.types.carbon.ServiceDTO;
import org.wso2.carbon.ui.CarbonUIUtil;
import org.wso2.carbon.utils.ServerConstants;
import org.bouncycastle.crypto.prng.RandomGenerator;
Index: org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/BAMListAdminServiceClient.java
===================================================================
--- org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/BAMListAdminServiceClient.java (revision 91155)
+++ org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/BAMListAdminServiceClient.java (working copy)
@@ -23,10 +23,12 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.client.Options;
-import org.wso2.carbon.gauges.ui.types.carbon.ActivityDTO;
-import org.wso2.carbon.gauges.ui.types.carbon.MessageDTO;
-import org.wso2.carbon.gauges.ui.types.carbon.MonitoredServerDTO;
-import org.wso2.carbon.gauges.ui.types.carbon.ServiceDTO;
+import org.wso2.carbon.gauges.stub.BAMException;
+import org.wso2.carbon.gauges.stub.BAMListAdminServiceStub;
+import org.wso2.carbon.gauges.stub.types.carbon.ActivityDTO;
+import org.wso2.carbon.gauges.stub.types.carbon.MessageDTO;
+import org.wso2.carbon.gauges.stub.types.carbon.MonitoredServerDTO;
+import org.wso2.carbon.gauges.stub.types.carbon.ServiceDTO;
import java.util.Locale;
import java.rmi.RemoteException;
Index: org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/BAMStatQueryDSClient.java
===================================================================
--- org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/BAMStatQueryDSClient.java (revision 91155)
+++ org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/BAMStatQueryDSClient.java (working copy)
@@ -42,7 +42,7 @@
import org.wso2.carbon.ui.CarbonUIUtil;
import org.wso2.carbon.CarbonConstants;
import org.wso2.carbon.utils.ServerConstants;
-import org.wso2.carbon.gauges.ui.BAMStatQueryDSStub;
+import org.wso2.carbon.gauges.stub.BAMStatQueryDSStub;
import org.wso2.carbon.bam.ActivityOperation;
import org.wso2.carbon.bam.Count;
import org.wso2.carbon.bam.Data;
Index: org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GadgetSourceServiceDataProcessor.java
===================================================================
--- org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GadgetSourceServiceDataProcessor.java (revision 91155)
+++ org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GadgetSourceServiceDataProcessor.java (working copy)
@@ -26,9 +26,9 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.wso2.carbon.CarbonConstants;
-import org.wso2.carbon.gauges.ui.governance.gadgetsource.beans.xsd.LifecycleInfoBean;
-import org.wso2.carbon.gauges.ui.governance.gadgetsource.beans.xsd.LifecyclePiechartGadgetBean;
-import org.wso2.carbon.gauges.ui.governance.gadgetsource.beans.xsd.LifecycleStageInfoBean;
+import org.wso2.carbon.gauges.stub.governance.gadgetsource.beans.xsd.LifecycleInfoBean;
+import org.wso2.carbon.gauges.stub.governance.gadgetsource.beans.xsd.LifecyclePiechartGadgetBean;
+import org.wso2.carbon.gauges.stub.governance.gadgetsource.beans.xsd.LifecycleStageInfoBean;
import org.wso2.carbon.ui.CarbonUIUtil;
import org.wso2.carbon.utils.ServerConstants;
Index: org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GovImpactAnalysisDataProcessor.java
===================================================================
--- org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GovImpactAnalysisDataProcessor.java (revision 91155)
+++ org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GovImpactAnalysisDataProcessor.java (working copy)
@@ -18,7 +18,12 @@
package org.wso2.carbon.gauges.ui;
import org.apache.axis2.AxisFault;
-import org.wso2.carbon.gauges.ui.governance.gadgets.impactanalysis.beans.xsd.*;
+import org.wso2.carbon.gauges.stub.GovernanceException;
+import org.wso2.carbon.gauges.stub.governance.gadgets.impactanalysis.beans.xsd.ImpactBean;
+import org.wso2.carbon.gauges.stub.governance.gadgets.impactanalysis.beans.xsd.PolicyBean;
+import org.wso2.carbon.gauges.stub.governance.gadgets.impactanalysis.beans.xsd.SchemaBean;
+import org.wso2.carbon.gauges.stub.governance.gadgets.impactanalysis.beans.xsd.ServiceBean;
+import org.wso2.carbon.gauges.stub.governance.gadgets.impactanalysis.beans.xsd.WSDLBean;
import org.wso2.carbon.registry.core.utils.RegistryUtils;
import org.wso2.carbon.registry.core.utils.UUIDGenerator;
import org.wso2.carbon.ui.CarbonUIUtil;
Index: org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GadgetSourceServiceClient.java
===================================================================
--- org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GadgetSourceServiceClient.java (revision 91155)
+++ org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/GadgetSourceServiceClient.java (working copy)
@@ -26,7 +26,9 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.gauges.ui.governance.gadgetsource.beans.xsd.LifecyclePiechartGadgetBean;
+import org.wso2.carbon.gauges.stub.GadgetSourceServiceStub;
+import org.wso2.carbon.gauges.stub.RegistryExceptionException;
+import org.wso2.carbon.gauges.stub.governance.gadgetsource.beans.xsd.LifecyclePiechartGadgetBean;
public class GadgetSourceServiceClient {
Index: org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/ResourceImpactAdminClient.java
===================================================================
--- org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/ResourceImpactAdminClient.java (revision 91155)
+++ org.wso2.carbon.gauges.ui/src/main/java/org/wso2/carbon/gauges/ui/ResourceImpactAdminClient.java (working copy)
@@ -30,7 +30,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.CarbonConstants;
-import org.wso2.carbon.gauges.ui.registry.core.xsd.Association;
+import org.wso2.carbon.gauges.stub.RegistryException;
+import org.wso2.carbon.gauges.stub.ResourceImpactAdminServiceStub;
+import org.wso2.carbon.gauges.stub.registry.core.xsd.Association;
import org.wso2.carbon.ui.CarbonUIUtil;
import org.wso2.carbon.utils.ServerConstants;
@@ -61,7 +63,8 @@
}
- public Association[] getResourceAssociations(String path) throws RemoteException, RegistryException{
+ public Association[] getResourceAssociations(String path) throws RemoteException,
+ RegistryException {
return stub.getAssociations(path);
}
}
Index: org.wso2.carbon.gauges.ui/pom.xml
===================================================================
--- org.wso2.carbon.gauges.ui/pom.xml (revision 91155)
+++ org.wso2.carbon.gauges.ui/pom.xml (working copy)
@@ -52,6 +52,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.gauges.stub</artifactId>
+ <version>${wso2carbon.version.gauges}</version>
</dependency>
</dependencies>
@@ -72,9 +73,9 @@
<Import-Package>
javax.servlet;version="2.4.0",
javax.servlet.http;version="2.4.0",
+ org.wso2.carbon.gauges.stub.*;version="${carbon.platform.package.import.version.range}",
*;resolution:=optional
</Import-Package>
- <Embed-Dependency>org.wso2.carbon.gauges.stub;scope=compile|runtime;inline=true</Embed-Dependency>
<DynamicImport-Package>*</DynamicImport-Package>
<Carbon-Component>UIBundle</Carbon-Component>
</instructions>
Index: org.wso2.carbon.gauges.ui.feature/pom.xml
===================================================================
--- org.wso2.carbon.gauges.ui.feature/pom.xml (revision 90999)
+++ org.wso2.carbon.gauges.ui.feature/pom.xml (working copy)
@@ -37,6 +37,10 @@
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.gauges.ui</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.gauges.stub</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -63,6 +67,7 @@
</adviceFile>
<bundles>
<bundleDef>org.wso2.carbon:org.wso2.carbon.gauges.ui</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.gauges.stub</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.ui:${wso2carbon.version}</importFeatureDef>
Index: pom.xml
===================================================================
--- pom.xml (revision 90999)
+++ pom.xml (working copy)
@@ -43,6 +43,11 @@
<artifactId>org.wso2.carbon.gauges.ui</artifactId>
<version>${wso2carbon.version.gauges}</version>
</dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.gauges.stub</artifactId>
+ <version>${wso2carbon.version.gauges}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
_______________________________________________
Carbon-dev mailing list
Carbon-dev@wso2.org
http://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev
