You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by mm...@apache.org on 2004/11/02 02:19:48 UTC

svn commit: rev 56316 - in incubator/beehive/branches/v1/alpha/samples: PetStoreDashboard PetStoreDashboard/src/ui petstoreWeb/WEB-INF/src

Author: mmerz
Date: Mon Nov  1 17:19:47 2004
New Revision: 56316

Modified:
   incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/build.xml
   incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/src/ui/PetStoreDashboard.java
   incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/src/ui/PetStoreProductView.java
   incubator/beehive/branches/v1/alpha/samples/petstoreWeb/WEB-INF/src/PetstoreInventoryManager.jws
Log:
Made a few changes to ensure that the Petstore Web Service and the
PetstoreDashboard play nicely together.  

Contributor: Jonathan Colwell



Modified: incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/build.xml	(original)
+++ incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/build.xml	Mon Nov  1 17:19:47 2004
@@ -3,7 +3,7 @@
 <project name="PetStoreDashboard" basedir="." default="all">
 	
 	<property name="wsdl.url" 
-		value="http://localhost:8080/petstoreWeb/petstore.jws?wsdl" />
+		value="http://localhost:8080/petstoreWeb/PetstoreInventoryManager.jws?wsdl" />
 	
 	
 	<path id="jars">

Modified: incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/src/ui/PetStoreDashboard.java
==============================================================================
--- incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/src/ui/PetStoreDashboard.java	(original)
+++ incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/src/ui/PetStoreDashboard.java	Mon Nov  1 17:19:47 2004
@@ -31,17 +31,17 @@
 import javax.swing.JPanel;
 import javax.swing.JSplitPane;
 
-import org.apache.beehive.PetStoreInventoryManager.PetStoreInventoryManager;
+import org.apache.beehive.petstore.PetstoreInventoryManager;
 
 
 public class PetStoreDashboard extends JPanel {
     private static final long serialVersionUID = 1L;
 
-	PetStoreInventoryManager store;
+	PetstoreInventoryManager store;
 
     private PetStoreProductView productView;
 
-    public PetStoreDashboard(PetStoreInventoryManager store) {
+    public PetStoreDashboard(PetstoreInventoryManager store) {
         super(new GridLayout(1, 0));
         this.store = store;
 
@@ -76,11 +76,11 @@
 
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
-        PetStoreInventoryManager store;
+        PetstoreInventoryManager store;
 
               try {
-                store = (org.apache.beehive.PetStoreInventoryManager.PetStoreInventoryManagerSoapBindingStub)
-                              new org.apache.beehive.PetStoreInventoryManager.PetStoreInventoryManagementServiceLocator().getPetStoreInventoryManager();
+                store = (org.apache.beehive.petstore.PetstoreInventoryManagerSoapBindingStub)
+                              new org.apache.beehive.petstore.PetstoreInventoryManagementServiceLocator().getPetstoreInventoryManager();
             }
             catch (javax.xml.rpc.ServiceException jre) {
                 if(jre.getLinkedCause()!=null)
@@ -89,7 +89,7 @@
             }
  
             // Time out after a minute
-            ((org.apache.beehive.PetStoreInventoryManager.PetStoreInventoryManagerSoapBindingStub)store).setTimeout(60000);
+            ((org.apache.beehive.petstore.PetstoreInventoryManagerSoapBindingStub)store).setTimeout(60000);
             
   
 
@@ -110,4 +110,4 @@
             }
         });
     }
-}
\ No newline at end of file
+}

Modified: incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/src/ui/PetStoreProductView.java
==============================================================================
--- incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/src/ui/PetStoreProductView.java	(original)
+++ incubator/beehive/branches/v1/alpha/samples/PetStoreDashboard/src/ui/PetStoreProductView.java	Mon Nov  1 17:19:47 2004
@@ -48,8 +48,8 @@
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.TreeSelectionModel;
 
-import org.apache.beehive.PetStoreInventoryManager.InvalidIdentifierException;
-import org.apache.beehive.PetStoreInventoryManager.PetStoreInventoryManager;
+import org.apache.beehive.petstore.InvalidIdentifierException;
+import org.apache.beehive.petstore.PetstoreInventoryManager;
 import org.apache.beehive.samples.petstore.model.Item;
 import org.apache.beehive.samples.petstore.model.ws.Category;
 import org.apache.beehive.samples.petstore.model.ws.Product;
@@ -60,7 +60,7 @@
         TreeSelectionListener {
     private static final long serialVersionUID = 1L;
 
-    PetStoreInventoryManager store;
+    PetstoreInventoryManager store;
 
     private JTree tree;
 
@@ -72,7 +72,7 @@
 
     private ProductItemView currentProductItemView;
 
-    public PetStoreProductView(PetStoreInventoryManager store) {
+    public PetStoreProductView(PetstoreInventoryManager store) {
         super(new GridLayout(1, 0));
 
         this.store = store;
@@ -475,4 +475,4 @@
 
 
     }
-}
\ No newline at end of file
+}

Modified: incubator/beehive/branches/v1/alpha/samples/petstoreWeb/WEB-INF/src/PetstoreInventoryManager.jws
==============================================================================
--- incubator/beehive/branches/v1/alpha/samples/petstoreWeb/WEB-INF/src/PetstoreInventoryManager.jws	(original)
+++ incubator/beehive/branches/v1/alpha/samples/petstoreWeb/WEB-INF/src/PetstoreInventoryManager.jws	Mon Nov  1 17:19:47 2004
@@ -53,10 +53,10 @@
  *
  * @author Jonathan Colwell
  */
-@WebService(name = "PetStoreInventoryManager",
-            serviceName = "PetStoreInventoryManagementService",
+@WebService(name = "PetstoreInventoryManager",
+            serviceName = "PetstoreInventoryManagementService",
             targetNamespace = 
-            "http://beehive.apache.org/PetstoreInventoryManager")
+            "http://beehive.apache.org/petstore")
 //@SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.ENCODED)
 public class PetstoreInventoryManager implements ServiceLifecycle {
 
@@ -88,9 +88,6 @@
                     .instantiate(getClass().getClassLoader(),
                                  CatalogControlBean.class.getName());
             }
-            else {
-                System.out.println("AutoInstantiation for controls is in effect");
-            }
         }
         catch (Exception e) {
             e.printStackTrace();
@@ -166,11 +163,11 @@
     @WebResult(name = "CategoryList")
     public org.apache.beehive.samples.petstore.model.ws.Category[] listCategories()
     {
-        System.out.println("listing categories");
+
         try {
             Category[] categories = getCatalogBean().getCategoryList();
             if (categories != null && categories.length > 0) {
-                System.out.println("got " + categories.length + " categories");
+
                 org.apache.beehive.samples.petstore.model.ws.Category[] outCats = 
                     new org.apache.beehive.samples.petstore.model.ws.Category[categories.length];
             
@@ -180,11 +177,7 @@
                     outCats[j] = new org.apache.beehive.samples.petstore.model.ws.Category
                         (categories[j], img);
                 }
-                System.out.println("returning " + outCats.length + " categories");
                 return outCats;
-            }
-            else {
-                System.out.println("got no categories");
             }
         }
         catch (Throwable e) {