You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2007/12/20 04:52:51 UTC

svn commit: r605798 - in /incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server: JavascriptExample.java JavascriptExampleImpl.java data/Ingredient.java

Author: ningjiang
Date: Wed Dec 19 19:52:48 2007
New Revision: 605798

URL: http://svn.apache.org/viewvc?rev=605798&view=rev
Log:
Fixed the build error 

Modified:
    incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/JavascriptExample.java
    incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/JavascriptExampleImpl.java
    incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/data/Ingredient.java

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/JavascriptExample.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/JavascriptExample.java?rev=605798&r1=605797&r2=605798&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/JavascriptExample.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/JavascriptExample.java Wed Dec 19 19:52:48 2007
@@ -20,14 +20,16 @@
 
 import java.util.List;
 
-import demo.hw.server.data.Beverage;
-import demo.hw.server.data.Category;
-import demo.hw.server.data.Ingredient;
-
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
+
+import demo.hw.server.data.Beverage;
+import demo.hw.server.data.Category;
+import demo.hw.server.data.Ingredient;
+
+
 
 @WebService(targetNamespace = "urn:cxf.apache.org:jsjaxws")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/JavascriptExampleImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/JavascriptExampleImpl.java?rev=605798&r1=605797&r2=605798&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/JavascriptExampleImpl.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/JavascriptExampleImpl.java Wed Dec 19 19:52:48 2007
@@ -18,15 +18,16 @@
  */
 package demo.hw.server;
 
-import demo.hw.server.data.Beverage;
-import demo.hw.server.data.Category;
-import demo.hw.server.data.Ingredient;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.jws.WebService;
 
+import demo.hw.server.data.Beverage;
+import demo.hw.server.data.Category;
+import demo.hw.server.data.Ingredient;
+
+
 @WebService(endpointInterface = "demo.hw.server.JavascriptExample")
 public class JavascriptExampleImpl implements JavascriptExample {
     
@@ -105,7 +106,7 @@
         List<Beverage> matches = new ArrayList<Beverage>();
         for (Beverage b : beverages) {
             for (Ingredient bi : b.getIngredients()) {
-                if(bi == i) {
+                if (bi == i) {
                     matches.add(b);
                     break;
                 }

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/data/Ingredient.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/data/Ingredient.java?rev=605798&r1=605797&r2=605798&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/data/Ingredient.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server/data/Ingredient.java Wed Dec 19 19:52:48 2007
@@ -19,6 +19,9 @@
 package demo.hw.server.data;
 
 public class Ingredient {
+    private String name;
+    private Category category;     
+
     @Override
     public boolean equals(Object obj) {
         try {
@@ -29,9 +32,7 @@
         }
     }
     
-    private String name;
-    private Category category;
-    
+        
     public String getName() {
         return name;
     }



Re: svn commit: r605798 - in /incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server: JavascriptExample.java JavascriptExampleImpl.java data/Ingredient.java

Posted by Benson Margulies <bi...@gmail.com>.
All our demos leave that package scheme.

The problem was import ordering. 

On Wed, 2007-12-19 at 23:23 -0500, Glen Mazza wrote:
> Am Donnerstag, den 20.12.2007, 03:52 +0000 schrieb ningjiang@apache.org:
> > Author: ningjiang
> > Date: Wed Dec 19 19:52:48 2007
> > New Revision: 605798
> > 
> > +
> > +import demo.hw.server.data.Beverage;
> > +import demo.hw.server.data.Category;
> > +import demo.hw.server.data.Ingredient;
> > +
> 
> I'm not sure, Willem, but I don't believe our code is supposed to leave
> the org.apache.cxf.xxxx package naming scheme.  (org.apache.cxf.demo or
> whatever should be fine instead.)
> 
> Glen
> 


Re: svn commit: r605798 - in /incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/hw/server: JavascriptExample.java JavascriptExampleImpl.java data/Ingredient.java

Posted by Glen Mazza <gl...@verizon.net>.
Am Donnerstag, den 20.12.2007, 03:52 +0000 schrieb ningjiang@apache.org:
> Author: ningjiang
> Date: Wed Dec 19 19:52:48 2007
> New Revision: 605798
> 
> +
> +import demo.hw.server.data.Beverage;
> +import demo.hw.server.data.Category;
> +import demo.hw.server.data.Ingredient;
> +

I'm not sure, Willem, but I don't believe our code is supposed to leave
the org.apache.cxf.xxxx package naming scheme.  (org.apache.cxf.demo or
whatever should be fine instead.)

Glen