Author: philharveyonline Date: Tue Jan 15 17:31:19 2013 New Revision: 1433545
URL: http://svn.apache.org/viewvc?rev=1433545&view=rev Log: PROTON-191: API reconciliation tool tidy-up - removed whitespace, added comments etc Added: qpid/proton/branches/jni-binding/design/api-reconciliation/README Modified: qpid/proton/branches/jni-binding/design/api-reconciliation/generate-c-functions.sh qpid/proton/branches/jni-binding/design/api-reconciliation/pom.xml qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/Main.java qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/packagesearcher/PackageSearcher.java qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/reportwriter/AnnotationAccessor.java qpid/proton/branches/jni-binding/design/api-reconciliation/src/test/java/org/apache/qpid/proton/apireconciliation/JoinerTest.java qpid/proton/branches/jni-binding/design/api-reconciliation/src/test/java/org/apache/qpid/proton/apireconciliation/reportwriter/AnnotationAccessorTest.java qpid/proton/branches/jni-binding/proton-j/proton/src/test/java/org/apache/qpid/proton/test/JythonTest.java Added: qpid/proton/branches/jni-binding/design/api-reconciliation/README URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/design/api-reconciliation/README?rev=1433545&view=auto ============================================================================== --- qpid/proton/branches/jni-binding/design/api-reconciliation/README (added) +++ qpid/proton/branches/jni-binding/design/api-reconciliation/README Tue Jan 15 17:31:19 2013 @@ -0,0 +1,4 @@ +Tool to generate a report mapping proton-c functions to proton-j class methods. +On Linux, the list of proton-c functions can be generated using generate-c-functions.sh + +See pom.xml for more details. Modified: qpid/proton/branches/jni-binding/design/api-reconciliation/generate-c-functions.sh URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/design/api-reconciliation/generate-c-functions.sh?rev=1433545&r1=1433544&r2=1433545&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/design/api-reconciliation/generate-c-functions.sh (original) +++ qpid/proton/branches/jni-binding/design/api-reconciliation/generate-c-functions.sh Tue Jan 15 17:31:19 2013 @@ -18,6 +18,8 @@ # under the License. # +# Script to generate a list of proton-c functions for use as input to the api-reconciliation tool. + BASE_DIR=`dirname $0` INCLUDE_DIR=$BASE_DIR/../../proton-c/include/proton OUTPUT_DIR=$BASE_DIR/target Modified: qpid/proton/branches/jni-binding/design/api-reconciliation/pom.xml URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/design/api-reconciliation/pom.xml?rev=1433545&r1=1433544&r2=1433545&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/design/api-reconciliation/pom.xml (original) +++ qpid/proton/branches/jni-binding/design/api-reconciliation/pom.xml Tue Jan 15 17:31:19 2013 @@ -28,7 +28,6 @@ <proton-c-build-dir>${basedir}/../../proton-c/build</proton-c-build-dir> <jni-jar>${proton-c-build-dir}/bindings/java/proton-jni.jar</jni-jar> </properties> - <build> <plugins> <plugin> @@ -60,13 +59,11 @@ <scope>system</scope> <systemPath>${jni-jar}</systemPath> </dependency> - <!-- <dependency> <groupId>org.apache.qpid</groupId> - <artifactId>proton-j-impl</artifactId> + <artifactId>proton-api</artifactId> <version>1.0-SNAPSHOT</version> </dependency> - --> </dependencies> </plugin> </plugins> @@ -79,11 +76,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>proton-api</artifactId> - <version>1.0-SNAPSHOT</version> - </dependency> - <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> <version>0.9.8</version> @@ -99,4 +91,11 @@ <version>2.4</version> </dependency> </dependencies> + <description>Tool to generate a report mapping proton-c functions to proton-j class methods. +Can be run using sensible defaults using "mvn exec:java"</description> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>12</version> + </parent> </project> Modified: qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/Main.java URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/Main.java?rev=1433545&r1=1433544&r2=1433545&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/Main.java (original) +++ qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/Main.java Tue Jan 15 17:31:19 2013 @@ -31,7 +31,8 @@ public class Main { if (args.length != 4) { - System.err.println("Unexpected number of arguments"); + System.err.println("Unexpected number of arguments. Usage:"); + System.err.println(" java " + Main.class.getName() + " packageRootName cFunctionFile annotationClassName outputFile"); Runtime.getRuntime().exit(-1); } Modified: qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/packagesearcher/PackageSearcher.java URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/packagesearcher/PackageSearcher.java?rev=1433545&r1=1433544&r2=1433545&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/packagesearcher/PackageSearcher.java (original) +++ qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/packagesearcher/PackageSearcher.java Tue Jan 15 17:31:19 2013 @@ -58,7 +58,7 @@ public class PackageSearcher { Class implementingClass = (Class) implementingClassObj; LOGGER.fine("Found implementation " + implementingClass.getName() + " for " + apiInterface.getName()); - + for (Method apiMethod : apiMethodList) { Method implMethod = findImplMethodOfApiMethod(apiMethod, implementingClass); Modified: qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/reportwriter/AnnotationAccessor.java URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/reportwriter/AnnotationAccessor.java?rev=1433545&r1=1433544&r2=1433545&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/reportwriter/AnnotationAccessor.java (original) +++ qpid/proton/branches/jni-binding/design/api-reconciliation/src/main/java/org/apache/qpid/proton/apireconciliation/reportwriter/AnnotationAccessor.java Tue Jan 15 17:31:19 2013 @@ -40,7 +40,7 @@ public class AnnotationAccessor { throw new IllegalArgumentException("Couldn't find annotation class " + annotationClassName, e); } - + try { _functionNameMethod = _annotationClass.getMethod(VALUE_METHOD); Modified: qpid/proton/branches/jni-binding/design/api-reconciliation/src/test/java/org/apache/qpid/proton/apireconciliation/JoinerTest.java URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/design/api-reconciliation/src/test/java/org/apache/qpid/proton/apireconciliation/JoinerTest.java?rev=1433545&r1=1433544&r2=1433545&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/design/api-reconciliation/src/test/java/org/apache/qpid/proton/apireconciliation/JoinerTest.java (original) +++ qpid/proton/branches/jni-binding/design/api-reconciliation/src/test/java/org/apache/qpid/proton/apireconciliation/JoinerTest.java Tue Jan 15 17:31:19 2013 @@ -50,9 +50,9 @@ public class JoinerTest _method2 = getClass().getMethod("javaMethodWithMapping2"); _methodSharingFunctionNameAnnotationWithMethod2 = getClass().getMethod("javaMethodSharingFunctionNameAnnotationWithMethod2"); _methodWithoutAnnotation = getClass().getMethod("javaMethodWithoutAnnotation"); - + AnnotationAccessor annotationAccessor = new AnnotationAccessor(TestAnnotation.class.getName()); - + _joiner = new Joiner(annotationAccessor); } Modified: qpid/proton/branches/jni-binding/design/api-reconciliation/src/test/java/org/apache/qpid/proton/apireconciliation/reportwriter/AnnotationAccessorTest.java URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/design/api-reconciliation/src/test/java/org/apache/qpid/proton/apireconciliation/reportwriter/AnnotationAccessorTest.java?rev=1433545&r1=1433544&r2=1433545&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/design/api-reconciliation/src/test/java/org/apache/qpid/proton/apireconciliation/reportwriter/AnnotationAccessorTest.java (original) +++ qpid/proton/branches/jni-binding/design/api-reconciliation/src/test/java/org/apache/qpid/proton/apireconciliation/reportwriter/AnnotationAccessorTest.java Tue Jan 15 17:31:19 2013 @@ -32,7 +32,7 @@ public class AnnotationAccessorTest private static final String ANNOTATION_VALUE_1 = "value1"; private static final String ANNOTATED_METHOD_NAME = "annotatedMethod"; private static final String UNANNOTATED_METHOD_NAME = "unannotatedMethod"; - + private Method _annotatedMethod; private Method _unannotatedMethod; @@ -65,7 +65,7 @@ public class AnnotationAccessorTest public void annotatedMethod() { } - + public void unannotatedMethod() { } Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/test/java/org/apache/qpid/proton/test/JythonTest.java URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/test/java/org/apache/qpid/proton/test/JythonTest.java?rev=1433545&r1=1433544&r2=1433545&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/proton-j/proton/src/test/java/org/apache/qpid/proton/test/JythonTest.java (original) +++ qpid/proton/branches/jni-binding/proton-j/proton/src/test/java/org/apache/qpid/proton/test/JythonTest.java Tue Jan 15 17:31:19 2013 @@ -20,7 +20,6 @@ */ package org.apache.qpid.proton.test; -import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.*; @@ -31,8 +30,6 @@ import java.io.File; /** * Runs all the python tests. */ -// PHTODO reinstate python -@Ignore public class JythonTest { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
