incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From monte...@apache.org
Subject svn commit: r834840 - in /incubator/kato/trunk/org.apache.kato/kato.anttasks: ./ .settings/ src/main/java/org/apache/kato/anttasks/ src/main/java/org/apache/kato/anttasks/tck/ src/main/java/org/apache/kato/anttasks/tcklistbuilder/ src/main/java/org/apa...
Date Wed, 11 Nov 2009 11:11:37 GMT
Author: monteith
Date: Wed Nov 11 11:11:35 2009
New Revision: 834840

URL: http://svn.apache.org/viewvc?rev=834840&view=rev
Log:
Remove unneeded TCKListbuilder, and fixup rest of code to compile against 1.4.

Removed:
    incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tcklistbuilder/
Modified:
    incubator/kato/trunk/org.apache.kato/kato.anttasks/.classpath
    incubator/kato/trunk/org.apache.kato/kato.anttasks/.settings/org.eclipse.jdt.core.prefs
    incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/AbstractJavaDocAntTask.java
    incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tck/TCKSetupTask.java
    incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/xmlgen/XMLJavaDocDoclet.java
    incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/xmlgen/XMLWriter.java
    incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/resources/org/apache/kato/anttasks/anttasks.properties

Modified: incubator/kato/trunk/org.apache.kato/kato.anttasks/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.anttasks/.classpath?rev=834840&r1=834839&r2=834840&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.anttasks/.classpath (original)
+++ incubator/kato/trunk/org.apache.kato/kato.anttasks/.classpath Wed Nov 11 11:11:35 2009
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: incubator/kato/trunk/org.apache.kato/kato.anttasks/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.anttasks/.settings/org.eclipse.jdt.core.prefs?rev=834840&r1=834839&r2=834840&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.anttasks/.settings/org.eclipse.jdt.core.prefs
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.anttasks/.settings/org.eclipse.jdt.core.prefs
Wed Nov 11 11:11:35 2009
@@ -1,5 +1,5 @@
-#Tue Jun 16 16:47:54 BST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
+#Wed Nov 11 10:26:08 GMT 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4

Modified: incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/AbstractJavaDocAntTask.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/AbstractJavaDocAntTask.java?rev=834840&r1=834839&r2=834840&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/AbstractJavaDocAntTask.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/AbstractJavaDocAntTask.java
Wed Nov 11 11:11:35 2009
@@ -31,7 +31,14 @@
 	
 	public AbstractJavaDocAntTask(String tagName,Class docletClass) {
 		this.tagName=tagName;
-		this.docletName=docletClass.getCanonicalName();
+		//this.docletName=docletClass.getCanonicalName();
+
+		// Duplicate the above functionality for 1.4
+		String className = docletClass.getName();
+		if (className.indexOf('$') != -1) {
+			className = null;
+		}
+		this.docletName= className;
 	}
 	
 	public void execute() throws BuildException {

Modified: incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tck/TCKSetupTask.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tck/TCKSetupTask.java?rev=834840&r1=834839&r2=834840&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tck/TCKSetupTask.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tck/TCKSetupTask.java
Wed Nov 11 11:11:35 2009
@@ -43,16 +43,14 @@
 		super.setClassname("org.apache.kato.tck.harness.scenario.ScenarioLauncher");
 	}
 
-	@Override
 	public void setFork(boolean s) {
 		throw new BuildException("cannot set fork on setup task");
 	}
 
-	@Override
 	public void setFailonerror(boolean s) {
 		throw new BuildException("cannot set fail on error on setup task");
 	}
-	@Override
+
 	public void execute() throws BuildException {
 		
 		configureScenerios();
@@ -121,7 +119,6 @@
 	}
 
 	
-	@Override
 	public void setClassname(String s) throws BuildException {
 		throw new BuildException("cannot set classname on setup task");
 		
@@ -138,7 +135,6 @@
 		return validateOnly;
 	}
 
-	@Override
 	public void addEnv(Variable var) {
 		
 		super.addEnv(var);

Modified: incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/xmlgen/XMLJavaDocDoclet.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/xmlgen/XMLJavaDocDoclet.java?rev=834840&r1=834839&r2=834840&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/xmlgen/XMLJavaDocDoclet.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/xmlgen/XMLJavaDocDoclet.java
Wed Nov 11 11:11:35 2009
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -59,11 +60,13 @@
 		  
 		  writer.open();
 		  
-		  Map<String,PackageDoc> map=new TreeMap<String,PackageDoc>();
+		  //<String,PackageDoc>
+		  Map map=new TreeMap();
 		  
 		  ClassDoc[] classes=root.classes();
 		  
-		  for(ClassDoc c:classes) {
+		  for(int i=0; i < classes.length; i++) {
+			  ClassDoc c = classes[i];
 			  
 			  PackageDoc owner=c.containingPackage();
 			  String name=owner.name();
@@ -72,7 +75,10 @@
 			  }
 		  }
 		  
-		  for(PackageDoc p:map.values()) {
+		  Iterator valueIt = map.values().iterator();
+		  while (valueIt.hasNext()) {
+			  PackageDoc p = (PackageDoc) valueIt.next();
+			  
 			  writer.addPackageContents(p);
 		  }
 		  

Modified: incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/xmlgen/XMLWriter.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/xmlgen/XMLWriter.java?rev=834840&r1=834839&r2=834840&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/xmlgen/XMLWriter.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/xmlgen/XMLWriter.java
Wed Nov 11 11:11:35 2009
@@ -66,14 +66,20 @@
 		writeSummary(tags);
 		
 		writeComment(c.commentText());
-		for(FieldDoc f:c.fields()) {
-			writeField(f);
+		
+		FieldDoc[] fields = c.fields();		
+		for(int i=0; i < fields.length; i++) {
+			writeField(fields[i]);
 		}
-		for(ConstructorDoc r: c.constructors()) {
-			writeConstructor(r);
+		
+		ConstructorDoc[] constructors = c.constructors(); 
+		for(int i=0; i < constructors.length; i++) {
+			writeConstructor(constructors[i]);
 		}
-		for(MethodDoc m:c.methods()) {
-			writeMethod(m);
+		
+		MethodDoc[] methods = c.methods();
+		for(int i=0; i < methods.length; i++) {
+			writeMethod(methods[i]);
 		}
 		
 		SeeTag[] seetags=c.seeTags();
@@ -131,7 +137,8 @@
 	private void writeThrowsTags(ThrowsTag[] throwsTags) throws IOException {
 		if(throwsTags==null || throwsTags.length==0) return; // nothing to do
 		write("<throws>");
-		for(ThrowsTag t:throwsTags) {
+		for(int i=0; i < throwsTags.length; i++) {
+			ThrowsTag t = throwsTags[i];
 			String name=t.exceptionName();
 			String comment=t.exceptionComment();
 			write("<throw name=\""+name+"\">");
@@ -143,16 +150,16 @@
 	private void writeReturnTags(Tag[] returnTags) throws IOException {
 		if(returnTags==null || returnTags.length==0) return; // nothing to do
 		write("<returns>");
-		for(Tag t:returnTags) {
-			writeHTMLText("return",t.text());
+		for(int i=0; i < returnTags.length; i++) {
+			writeHTMLText("return",returnTags[i].text());
 		}
 		write("</returns>");
 	}
 	private void writeSeeTags(SeeTag[] seetags) {
 		if(seetags==null || seetags.length==0) return;
 		write("<seerefs>");
-		for(SeeTag seetag:seetags) {
-			write(seetag);
+		for(int i=0; i < seetags.length; i++) {
+			write(seetags[i]);
 		}
 		write("</seerefs>");
 		
@@ -165,8 +172,8 @@
 	private void write(ParamTag[] parameters) throws IOException {
 		if(parameters==null || parameters.length==0) return;
 		write("<paramdescs>");
-		for(ParamTag p:parameters) {
-			write(p);
+		for(int i=0; i < parameters.length; i++) {
+			write(parameters[i]);
 		}
 		write("</paramdescs>");
 		
@@ -183,8 +190,8 @@
 	private void write(Parameter[] parameters) {
 		if(parameters==null || parameters.length==0) return;
 		write("<parameters>");
-		for(Parameter p:parameters) {
-			write(p);
+		for(int i=0; i<parameters.length; i++) {
+			write(parameters[i]);
 		}
 		write("</parameters>");
 	}
@@ -256,8 +263,9 @@
         	parser.parse(new InputSource(new StringReader(commentText)), fragment);
 			
 		} catch (SAXException e) {
-			
-			throw new IOException(e);
+			IOException ioe = new IOException();
+			ioe.initCause(e);
+			throw ioe;
 		}
 		
 		
@@ -318,7 +326,7 @@
 			Node n=list.item(i);
 			switch (n.getNodeType()) {
 			case Node.TEXT_NODE :
-				String text=n.getTextContent();
+				String text=n.getNodeValue(); // Changed from getTextValue()
 				if(text!=null) write(text);
 				break;
 			case Node.ELEMENT_NODE :
@@ -376,8 +384,10 @@
 		Tag[] tags=c.firstSentenceTags();
 		writeSummary(tags);
 		writeComment(c.commentText());
-		for(MethodDoc m:c.methods()) {
-			writeMethod(m);
+		
+		MethodDoc[] methods = c.methods();
+		for(int i=0; i<methods.length; i++) {
+			writeMethod(methods[i]);
 		}
 		ClassDoc parent=c.superclass();
 		if(parent!=null) {
@@ -396,7 +406,9 @@
 			
 			writeComment(p.commentText());
 			
-			for (ClassDoc c : p.allClasses() ) {
+			ClassDoc[] allClasses = p.allClasses();
+			for (int i=0; i < allClasses.length; i++ ) {
+				ClassDoc c = allClasses[i];
 				if(c.isInterface()) {
 					writeInterface(c);
 				}
@@ -409,9 +421,10 @@
 	}
 	private void writeSummary(Tag[] tags) throws IOException {
 		if(tags!=null && tags.length>0) {
-			StringBuilder sb=new StringBuilder();
-			
-			for(Tag t:tags) {
+			StringBuffer sb=new StringBuffer();
+						
+			for(int i=0; i < tags.length; i++) {
+				Tag t = tags[i];
 				String kind=t.kind();
 				if(kind.equals("Text")) {
 					sb.append(t.text()+" ");

Modified: incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/resources/org/apache/kato/anttasks/anttasks.properties
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/resources/org/apache/kato/anttasks/anttasks.properties?rev=834840&r1=834839&r2=834840&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/resources/org/apache/kato/anttasks/anttasks.properties
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/resources/org/apache/kato/anttasks/anttasks.properties
Wed Nov 11 11:11:35 2009
@@ -12,6 +12,5 @@
 # limitations under the License.
 #-------------------------------------------------------------------------------
 sitebuilder=org.apache.kato.anttasks.sitebuilder.SiteBuilder
-tcklistbuilder=org.apache.kato.anttasks.tcklistbuilder.TCKListBuilder
 xmljavadoc=org.apache.kato.anttasks.xmlgen.XMLJavaDocGenerator
 tcksetup=org.apache.kato.anttasks.tck.TCKSetupTask
\ No newline at end of file



Mime
View raw message