[Carbon-commits] [Carbon] svn commit r91953 - in trunk/carbon/components/stratos/usage/org.wso2.carbon.usage: . src/main/java/org/wso2/carbon/usage/api

[sanjeewa at wso2.com]

Author: sanjeewa
Date: Mon Apr 18 22:50:32 2011
New Revision: 91953
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=91953

Log:
stub migration remain at usage

Modified:
   trunk/carbon/components/stratos/usage/org.wso2.carbon.usage/pom.xml
   trunk/carbon/components/stratos/usage/org.wso2.carbon.usage/src/main/java/org/wso2/carbon/usage/api/TenantUsageRetriever.java

Modified: trunk/carbon/components/stratos/usage/org.wso2.carbon.usage/pom.xml
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/stratos/usage/org.wso2.carbon.usage/pom.xml?rev=91953&r1=91952&r2=91953&view=diff
==============================================================================
--- trunk/carbon/components/stratos/usage/org.wso2.carbon.usage/pom.xml	(original)
+++ trunk/carbon/components/stratos/usage/org.wso2.carbon.usage/pom.xml	Mon Apr 18 22:50:32 2011
@@ -35,32 +35,6 @@
                 <artifactId>maven-scr-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>source-code-generation</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/MeteringQueryDS.wsdl -u -uw -o target/generated-code
-                                    -p org.wso2.carbon.usage.services
-                                    -ns2p http://ws.wso2.org/dataservice=org.wso2.carbon.usage.services,http://bam.carbon.wso2.org=org.wso2.carbon.usage.beans.xsd"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <executions>
@@ -98,6 +72,7 @@
                             org.wso2.carbon.usage.api.*,
                         </Export-Package>
                         <Import-Package>
+                            org.wso2.carbon.usage.meteringqueryds.stub.*,
                             org.wso2.carbon.rule.*,
                             org.wso2.carbon.registry.core.*;version=1.0.1,
                             org.wso2.carbon.registry.resource.*,
@@ -150,5 +125,9 @@
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.usage.agent</artifactId>
         </dependency>
+         <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.usage.meteringqueryds.stub</artifactId>
+        </dependency>
     </dependencies>
 </project>

Modified: trunk/carbon/components/stratos/usage/org.wso2.carbon.usage/src/main/java/org/wso2/carbon/usage/api/TenantUsageRetriever.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/stratos/usage/org.wso2.carbon.usage/src/main/java/org/wso2/carbon/usage/api/TenantUsageRetriever.java?rev=91953&r1=91952&r2=91953&view=diff
==============================================================================
--- trunk/carbon/components/stratos/usage/org.wso2.carbon.usage/src/main/java/org/wso2/carbon/usage/api/TenantUsageRetriever.java	(original)
+++ trunk/carbon/components/stratos/usage/org.wso2.carbon.usage/src/main/java/org/wso2/carbon/usage/api/TenantUsageRetriever.java	Mon Apr 18 22:50:32 2011
@@ -24,11 +24,11 @@
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.usage.beans.*;
-import org.wso2.carbon.usage.beans.xsd.BandwidthStat;
-import org.wso2.carbon.usage.beans.xsd.RegBandwidthStat;
-import org.wso2.carbon.usage.beans.xsd.ServiceRequestStat;
-import org.wso2.carbon.usage.services.MeteringQueryDSStub;
-import org.wso2.carbon.usage.beans.xsd.InstanceUsageStat;
+import org.wso2.carbon.usage.meteringqueryds.stub.beans.xsd.BandwidthStat;
+import org.wso2.carbon.usage.meteringqueryds.stub.beans.xsd.RegBandwidthStat;
+import org.wso2.carbon.usage.meteringqueryds.stub.beans.xsd.ServiceRequestStat;
+import org.wso2.carbon.usage.meteringqueryds.stub.MeteringQueryDSStub;
+import org.wso2.carbon.usage.meteringqueryds.stub.beans.xsd.InstanceUsageStat;
 import org.wso2.carbon.usage.util.Util;
 import org.wso2.carbon.user.core.UserRealm;
 import org.wso2.carbon.user.core.UserStoreException;