You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/03/21 07:28:35 UTC

svn commit: r1787903 - in /qpid/java/trunk/broker-core: ./ mllib/ src/main/java/ src/xsl/ templates/method/ templates/method/version/ templates/model/ templates/model/version/

Author: kwall
Date: Tue Mar 21 07:28:35 2017
New Revision: 1787903

URL: http://svn.apache.org/viewvc?rev=1787903&view=rev
Log:
QPID-7622: Remove remnants of the 0-8..0-10 protocol class generation mechanisms

* Majority of the 0-8..0-91 (Gentools) had been already removed by QPID-6125.
* 0-10's was already partial out of date since the adoption of QpidByteBuffers

Given these protocols are unlikely to change further, code generation can be removed.

Added:
    qpid/java/trunk/broker-core/src/main/java/velocity.timestamp
Removed:
    qpid/java/trunk/broker-core/Composite.tpl
    qpid/java/trunk/broker-core/Constant.tpl
    qpid/java/trunk/broker-core/Enum.tpl
    qpid/java/trunk/broker-core/Invoker.tpl
    qpid/java/trunk/broker-core/MethodDelegate.tpl
    qpid/java/trunk/broker-core/Option.tpl
    qpid/java/trunk/broker-core/StructFactory.tpl
    qpid/java/trunk/broker-core/Type.tpl
    qpid/java/trunk/broker-core/codegen
    qpid/java/trunk/broker-core/genutil.py
    qpid/java/trunk/broker-core/mllib/__init__.py
    qpid/java/trunk/broker-core/mllib/dom.py
    qpid/java/trunk/broker-core/mllib/parsers.py
    qpid/java/trunk/broker-core/mllib/transforms.py
    qpid/java/trunk/broker-core/src/main/java/broker.bnd
    qpid/java/trunk/broker-core/src/xsl/qmf.xsl
    qpid/java/trunk/broker-core/templates/method/MethodBodyInterface.vm
    qpid/java/trunk/broker-core/templates/method/version/MethodBodyClass.vm
    qpid/java/trunk/broker-core/templates/model/ClientMethodDispatcherInterface.vm
    qpid/java/trunk/broker-core/templates/model/MethodDispatcherInterface.vm
    qpid/java/trunk/broker-core/templates/model/MethodRegistryClass.vm
    qpid/java/trunk/broker-core/templates/model/ProtocolVersionListClass.vm
    qpid/java/trunk/broker-core/templates/model/ServerMethodDispatcherInterface.vm
    qpid/java/trunk/broker-core/templates/model/version/ClientMethodDispatcherInterface.vm
    qpid/java/trunk/broker-core/templates/model/version/MethodDispatcherInterface.vm
    qpid/java/trunk/broker-core/templates/model/version/MethodRegistryClass.vm
    qpid/java/trunk/broker-core/templates/model/version/ServerMethodDispatcherInterface.vm
    qpid/java/trunk/broker-core/templating.py
Modified:
    qpid/java/trunk/broker-core/build-generate-sources.xml
    qpid/java/trunk/broker-core/pom.xml

Modified: qpid/java/trunk/broker-core/build-generate-sources.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/build-generate-sources.xml?rev=1787903&r1=1787902&r2=1787903&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/build-generate-sources.xml (original)
+++ qpid/java/trunk/broker-core/build-generate-sources.xml Tue Mar 21 07:28:35 2017
@@ -29,7 +29,6 @@
 
     <dirname property="QpidBrokerCoreGenerateSources.basedir" file="${ant.file.QpidBrokerCoreGenerateSources}"/>
 
-    <property name="gentools.classes" location="${build.scratch}/common/gentools" />
     <property name="generated-logmessages-dir" location="${module.src}" />
     <property name="velocity.classes" value="${build.scratch}/broker-core/velocity"/>
     <property name="velocity.timestamp" location="${generated-logmessages-dir}/velocity.timestamp" />

Modified: qpid/java/trunk/broker-core/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/pom.xml?rev=1787903&r1=1787902&r2=1787903&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/pom.xml (original)
+++ qpid/java/trunk/broker-core/pom.xml Tue Mar 21 07:28:35 2017
@@ -240,14 +240,11 @@
                     <goal>run</goal>
                   </goals>
                   <configuration>
-                    <!-- TODO re-enable/re-work code generation -->
-                    <skip>true</skip>
                     <target>
                         <ant antfile="build-generate-sources.xml">
                           <reference torefid="source.generation.classpathref" refid="maven.plugin.classpath" />
                           <property name="build.compiler" value="extJavac" />
                           <property name="generated-logmessages-dir" value="${generated-logmessages-dir}" />
-                          <property name="gentools.classes" location="${basedir}/../common/target/gentools-classes" />
                           <property name="velocity.classes" value="${project.build.directory}/velocity-classes" />
                           <property name="module.src" value="${basedir}/src/main/java" />
                         </ant>
@@ -259,10 +256,12 @@
               <dependency>
                 <groupId>velocity</groupId>
                 <artifactId>velocity</artifactId>
+                <version>${velocity-version}</version>
               </dependency>
               <dependency>
                 <groupId>velocity</groupId>
                 <artifactId>velocity-dep</artifactId>
+                <version>${velocity-version}</version>
               </dependency>
             </dependencies>
           </plugin>

Added: qpid/java/trunk/broker-core/src/main/java/velocity.timestamp
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/velocity.timestamp?rev=1787903&view=auto
==============================================================================
    (empty)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org