cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r725761 - in /cxf/branches/2.1.x-fixes: ./ distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/ distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/types/ tools/wsdl...
Date Thu, 11 Dec 2008 18:11:16 GMT
Author: dkulp
Date: Thu Dec 11 10:11:15 2008
New Revision: 725761

URL: http://svn.apache.org/viewvc?rev=725761&view=rev
Log:
Merged revisions 725554 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r725554 | bimargulies | 2008-12-10 21:56:04 -0500 (Wed, 10 Dec 2008) | 2 lines
  
  Fix checkstyle errors.
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/ReadZoo.java
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/types/Zoo.java
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
  (props changed)

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 11 10:11:15 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725455,725506,725651,725671,725688
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725455,725506,725554,725651,725671,725688

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/ReadZoo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/ReadZoo.java?rev=725761&r1=725760&r2=725761&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/ReadZoo.java
(original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/ReadZoo.java
Thu Dec 11 10:11:15 2008
@@ -35,41 +35,41 @@
 /**
  * 
  */
-public class ReadZoo {
+public final class ReadZoo {
 
-	private XMLInputFactory inputFactory;
-	private String inputPathname;
+    private XMLInputFactory inputFactory;
+    private String inputPathname;
 
-	private ReadZoo() {
-		inputFactory = XMLInputFactory.newInstance();
-	}
+    private ReadZoo() {
+        inputFactory = XMLInputFactory.newInstance();
+    }
 
-	private void go() throws Exception {
-		AegisContext context;
+    private void go() throws Exception {
+        AegisContext context;
 
-		context = new AegisContext();
-		Set<Class<?>> rootClasses = new HashSet<Class<?>>();
-		rootClasses.add(Zoo.class);
-		context.setRootClasses(rootClasses);
-		context.initialize();
-		AegisReader<XMLStreamReader> reader = context.createXMLStreamReader();
-		FileInputStream input = new FileInputStream(inputPathname);
-		XMLStreamReader xmlReader = inputFactory.createXMLStreamReader(input);
-		Zoo zoo = (Zoo)reader.read(xmlReader);
-		System.out.println("Name " + zoo.getName());
-		System.out.println("Founder " + zoo.getFounder());
-		for(Map.Entry<String, Animal> e : zoo.getAnimals().entrySet()) {
-			System.out.println(e.getKey() + " -> " + e.getValue().getName());
-		}
-	}
+        context = new AegisContext();
+        Set<Class<?>> rootClasses = new HashSet<Class<?>>();
+        rootClasses.add(Zoo.class);
+        context.setRootClasses(rootClasses);
+        context.initialize();
+        AegisReader<XMLStreamReader> reader = context.createXMLStreamReader();
+        FileInputStream input = new FileInputStream(inputPathname);
+        XMLStreamReader xmlReader = inputFactory.createXMLStreamReader(input);
+        Zoo zoo = (Zoo)reader.read(xmlReader);
+        System.out.println("Name " + zoo.getName());
+        System.out.println("Founder " + zoo.getFounder());
+        for (Map.Entry<String, Animal> e : zoo.getAnimals().entrySet()) {
+            System.out.println(e.getKey() + " -> " + e.getValue().getName());
+        }
+    }
 
-	/**
-	 * @param args
-	 * @throws Exception
-	 */
-	public static void main(String[] args) throws Exception {
-		ReadZoo rz = new ReadZoo();
-		rz.inputPathname = args[0];
-		rz.go();
-	}
+    /**
+     * @param args
+     * @throws Exception
+     */
+    public static void main(String[] args) throws Exception {
+        ReadZoo rz = new ReadZoo();
+        rz.inputPathname = args[0];
+        rz.go();
+    }
 }

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java?rev=725761&r1=725760&r2=725761&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java
(original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java
Thu Dec 11 10:11:15 2008
@@ -25,12 +25,12 @@
 import java.util.Map;
 import java.util.Set;
 
-import javanet.staxutils.IndentingXMLStreamWriter;
-
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamWriter;
 
+import javanet.staxutils.IndentingXMLStreamWriter;
+
 import org.apache.cxf.aegis.AegisContext;
 import org.apache.cxf.aegis.AegisWriter;
 import org.apache.cxf.aegis.type.Type;
@@ -40,17 +40,17 @@
 /**
  * 
  */
-public class WriteZoo {
+public final class WriteZoo {
     private XMLOutputFactory outputFactory;
     private String outputPathname;
-    
+
     private WriteZoo() {
         outputFactory = XMLOutputFactory.newInstance();
     }
-    
+
     private void go() throws Exception {
         AegisContext context;
-        
+
         context = new AegisContext();
         context.setWriteXsiTypes(true);
         Set<Class<?>> rootClasses = new HashSet<Class<?>>();
@@ -61,15 +61,14 @@
         FileOutputStream output = new FileOutputStream(outputPathname);
         XMLStreamWriter xmlWriter = outputFactory.createXMLStreamWriter(output);
         IndentingXMLStreamWriter indentWriter = new IndentingXMLStreamWriter(xmlWriter);
-        
+
         Zoo zoo = populateZoo();
         Type aegisType = context.getTypeMapping().getType(zoo.getClass());
-        writer.write(zoo, new QName("urn:aegis:demo", "zoo"),
-                      false, indentWriter, aegisType);
+        writer.write(zoo, new QName("urn:aegis:demo", "zoo"), false, indentWriter, aegisType);
         xmlWriter.close();
         output.close();
     }
-    
+
     private Zoo populateZoo() {
         Zoo zoo = new Zoo();
         zoo.setFounder("Noah");
@@ -90,7 +89,7 @@
 
     /**
      * @param args
-     * @throws Exception 
+     * @throws Exception
      */
     public static void main(String[] args) throws Exception {
         WriteZoo wz = new WriteZoo();

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/types/Zoo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/types/Zoo.java?rev=725761&r1=725760&r2=725761&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/types/Zoo.java
(original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/types/Zoo.java
Thu Dec 11 10:11:15 2008
@@ -27,15 +27,14 @@
 public class Zoo {
     private String name;
     private String founder;
-    
+    private Map<String, Animal> animals;
+
     public String getFounder() {
         return founder;
     }
     public void setFounder(String founder) {
         this.founder = founder;
     }
-    private Map<String, Animal> animals;
-    
     
     public String getName() {
         return name;

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 11 10:11:15 2008
@@ -1 +1 @@
-/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl:722412,722988,723378,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725455,725506,725651,725671,725688
+/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl:722412,722988,723378,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725455,725506,725554,725651,725671,725688



Mime
View raw message