svn commit: r1303574 - in /qpid/proton/trunk/proton-j: ./ codec/ driver/ engine/src/org/apache/qpid/proton/engine/ resources/ src/ src/org/ src/org/apache/ src/org/apache/qpid/ src/org/apache/qpid/proton/ src/org/apache/qpid/proton/codec/ src/org/apach...

[rg...@apache.org]

Author: rgodfrey
Date: Wed Mar 21 21:17:40 2012
New Revision: 1303574

URL: http://svn.apache.org/viewvc?rev=1303574&view=rev
Log:
NO-JIRA : [Proton] Reorganized proton-j source tree

Added:
    qpid/proton/trunk/proton-j/src/
    qpid/proton/trunk/proton-j/src/org/
    qpid/proton/trunk/proton-j/src/org/apache/
    qpid/proton/trunk/proton-j/src/org/apache/qpid/
    qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/
    qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/codec/
      - copied from r1303568, qpid/proton/trunk/proton-j/codec/src/org/apache/qpid/proton/codec/
    qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/driver/
      - copied from r1303568, qpid/proton/trunk/proton-j/driver/src/org/apache/qpid/proton/driver/
    qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/
      - copied from r1303568, qpid/proton/trunk/proton-j/engine/src/org/apache/qpid/proton/engine/
    qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/framing/
      - copied from r1303568, qpid/proton/trunk/proton-j/codec/src/org/apache/qpid/proton/framing/
    qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/type/
      - copied from r1303568, qpid/proton/trunk/proton-j/codec/src/org/apache/qpid/proton/type/
Removed:
    qpid/proton/trunk/proton-j/codec/
    qpid/proton/trunk/proton-j/driver/
    qpid/proton/trunk/proton-j/engine/src/org/apache/qpid/proton/engine/
    qpid/proton/trunk/proton-j/module.xml
    qpid/proton/trunk/proton-j/resources/
    qpid/proton/trunk/proton-j/tasks/
Modified:
    qpid/proton/trunk/proton-j/build.xml

Modified: qpid/proton/trunk/proton-j/build.xml
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/build.xml?rev=1303574&r1=1303573&r2=1303574&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/build.xml (original)
+++ qpid/proton/trunk/proton-j/build.xml Wed Mar 21 21:17:40 2012
@@ -1,168 +1,51 @@
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<project name="Qpid AMQP 1.0" default="build">
-
-  <import file="common.xml"/>
-
-  <property name="modules.core"       value="codec engine driver"/>
-  <property name="modules.opt"        value=""/>
-  <property name="modules"            value="${modules.core} ${modules.opt}"/>
-
-  <property name="resources"     value="${project.root}/resources"/>
-
-  <map property="release.excludes" value="${modules}">
-    <globmapper from="*" to="*/\*\*"/>
-  </map>
-
-
-  <macrodef name="iterate">
-    <attribute name="target"/>
-    <attribute name="modules" default="${modules}"/>
-    <element name="elements" implicit="true" optional="true"/>
-    <sequential>
-      <subant target="@{target}" antfile="build.xml">
-        <filelist dir="." files="@{modules}"/>
-        <elements/>
-      </subant>
-    </sequential>
-  </macrodef>
+<project name="Qpid Proton J" default="dist" basedir=".">
+  <description>
+    Qpid Proton-J
+  </description>
 
-  <target name="compile" description="compile sources">
-    <iterate target="compile"/>
-  </target>
+  <!-- global properties for this build -->
+  <property name="src" location="src"/>
+  <property name="build" location="build"/>
+  <property name="dist"  location="dist"/>
+  <property name="classes" location="${build}/classes"/>
+  <property name="docs" location="${build}/docs"/>
 
-  <target name="compile-tests" description="compile unit tests">
-    <iterate target="compile-tests"/>
+  <target name="init">
+    <tstamp/>
+    <mkdir dir="${classes}"/>
   </target>
 
-  <target name="test" description="execute tests" depends="compile">
-
-    <delete file="${build.failed}"/>
-
-    <iterate target="test">
-      <property name="test.failures.ignore" value="true"/>
-    </iterate>
-
-    <condition property="failed">
-      <available file="${build.failed}"/>
-    </condition>
-
-    <fail if="failed" message="TEST SUITE FAILED"/>
-
-  </target>
-  
-  <target name="report-module" description="generate junitreport for modules">
-    <iterate target="report-module"/>
+  <target name="compile" depends="init" description="compile the source ">
+    <javac srcdir="${src}" destdir="${classes}"/>
   </target>
 
-  <target name="jar" description="create module jars">
-    <iterate target="jar"/>
-  </target>
+  <target name="apidoc">
+    <javadoc destdir="${docs}/api" author="true" version="true" use="true"
+             windowtitle="Qpid Proton API">
 
-  <target name="jar-tests" description="create unit test jars">
-    <iterate target="jar-tests"/>
-  </target>
+      <fileset dir="src" defaultexcludes="yes">
+        <include name="**/*.java"/>
+      </fileset>
 
-  <target name="libs" description="copy dependencies into build tree">
-    <iterate target="libs"/>
+      <doctitle><![CDATA[<h1>Qpid Proton</h1>]]></doctitle>
+      <tag name="todo" scope="all" description="To do:"/>
+      <link offline="true" href="http://download.oracle.com/javase/6/docs/api/" packagelistLoc="C:\tmp"/>
+      <link href="http://developer.java.sun.com/developer/products/xml/docs/api/"/>
+    </javadoc>
   </target>
 
-  <target name="doc" description="generate api-doc">
-    <iterate target="doc"/>
-  </target>
+  <target name="doc" depends="apidoc"/>
 
-  <target name="test-doc" description="generate api-doc">
-    <iterate target="test-doc"/>
-  </target>
+  <target name="dist" depends="compile,doc" description="generate the distribution">
+    <mkdir dir="${dist}/lib"/>
 
-  <target name="bundle" description="create OSGi bundles">
-    <iterate target="bundle"/>
-  </target>
-  
-  <target name="release-bin" description="build a binary release artifact" depends="build,bundle">
-      <iterate  target="release-bin"/>
+    <jar jarfile="${dist}/lib/qpidproton.jar" basedir="${classes}"/>
+    <zip destfile="${dist}/docs.zip" basedir="${docs}"/>
+    <zip destfile="${dist}/srcs.zip" basedir="${basedir}" excludes="build/**,dist/**"/>
   </target>
 
-
-  <target name="build" description="build the project">
-    <iterate target="build"/>
-  </target>
-
-  <target name="clean" description="remove build and release artifacts">
-    <iterate target="clean"/>
+  <target name="clean" description="clean up" >
     <delete dir="${build}"/>
+    <delete dir="${dist}"/>
   </target>
-
-  <target name="coverage-report" description="generate coverage report" depends="cobertura-init">
-    <cobertura-merge datafile="${build.coveragereport}/cobertura.ser">
-      <!-- merge all module coverage reports -->
-      <fileset dir="${build}">
-        <include name="**/*.ser"/>
-      </fileset>
-    </cobertura-merge>
-    <cobertura-report format="xml"
-                      destdir="${build.coveragereport}"
-		      datafile="${build.coveragereport}/cobertura.ser"
-		      >
-      <fileset dir="${project.root}/engine/src" includes="**/*.java" />
-      <fileset dir="${project.root}/codec/src" includes="**/*.java" />
-    </cobertura-report>
-	<cobertura-report format="html"
-                      destdir="${build.coveragereport}"
-		      datafile="${build.coveragereport}/cobertura.ser"
-		      >
-      <fileset dir="${project.root}/engine/src" includes="**/*.java" />
-      <fileset dir="${project.root}/codec/src" includes="**/*.java" />
-    </cobertura-report>
-  </target>
-
-  <target name="instrument" description="instrument for artifacts">
-    <iterate target="instrument"/>
-  </target>
-  
-  <target name="cover-test" description="run tests and generate coverage information" depends="build">
-    <iterate target="cover-test" modules="engine codec"/>
-  </target>
-
-  <target name="findbugs" depends="findbugs-init,build">
-
-    <mkdir dir="${build.findbugs}"/>
-
-    <findbugs home="${findbugs.dir}"
-              output="html"
-              outputFile="${build.findbugs}/report.html" 
-              stylesheet="fancy-hist.xsl"
-              jvmargs="-Xmx512m"
-              projectName="Qpid">
-      <auxAnalyzePath>
-        <fileset dir="${build.lib}" includes="qpid*.jar" excludes="*test*.jar *junit*.jar *example*.jar qpid-all.jar"/>
-      </auxAnalyzePath>
-      <auxClassPath>
-        <fileset dir="${build.lib}" includes="**/*.jar" />
-        <fileset dir="${basedir}/lib" includes="org.eclipse*.jar com.ibm.*.jar"/>
-      </auxClassPath>
-      <sourcePath>
-        <fileset dir="${basedir}" includes="**/src/**/org/.." />
-      </sourcePath>
-    </findbugs>
-  </target>
-
 </project>



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