SMACK-434 (and 529) Added support for experimental code, that is XEP's that have not yet made it to the draft state.

This new souce directory and artifact initially contains message carbons (XEP-0280) code provided by George Lukas.


git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13882 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -31,11 +31,13 @@
     <property name="version.extra" value="SNAPSHOT" />
 	
     <var name="mutable-version" value="${version.major}.${version.minor}.${version.revision}"/>
+    <var name="mutable-experimental-version" value="0.1"/>
 
 	<if>
         <length string="${version.extra}" when="greater" length="0"/>
         <then>
         	<var name="mutable-version" value="${mutable-version}.${version.extra}"/>
+        	<var name="mutable-experimental-version" value="${mutable-experimental-version}.${version.extra}" />
         </then>
     </if>
 	
@@ -46,10 +48,13 @@
                 <format property="build.date" pattern="yyyyMMdd" locale="en"/>
             </tstamp>
         	<var name="mutable-version" value="${mutable-version}-${build.date}" />
+        	<var name="mutable-experimental-version" value="${mutable-experimental-version}-${build.date}" />
         </then>
 	</if>
 
     <property name="version" value="${mutable-version}" />
+    <property name="experimental.version" value="${mutable-experimental-version}" />
+	
 	<property name="bundle.name" value="org.igniterealtime.smack" />
     <property file="${basedir}/build/build.properties" />
     <property name="compile.dir" value="${basedir}/target/classes" />
@@ -151,6 +156,23 @@
                 <pathelement path="${compile.dir}"/>
             </classpath>
         </javac>
+
+    	<mkdir dir="${compile.dir}/experimental" />
+        <javac
+            destdir="${compile.dir}/experimental"
+            includeAntRuntime="no"
+            debug="on"
+            source="1.6"
+            target="1.6"
+        >
+            <src path="${basedir}/experimental/source" />
+            <classpath>
+                <fileset dir="${merge.lib.dir}">
+                    <include name="*.jar"/>
+                </fileset>
+                <pathelement path="${compile.dir}"/>
+            </classpath>
+        </javac>
     </target>
 
     <!-- compile-test -->
@@ -285,6 +307,24 @@
             </manifest>
         </jar>
 
+    	<property name="experimental.jar.name" value="${jar.dest.dir}/smackx-experimental-${experimental.version}.jar" />
+        <copy todir="${compile.dir}/experimental/META-INF" file="${basedir}/experimental/resources/META-INF/experimental.providers" />
+        <jar destfile="${experimental.jar.name}"
+            basedir="${compile.dir}/experimental"
+            includes="org/jivesoftware/smackx/**/*.class, **/experimental.providers">
+            <manifest>
+                <attribute name="Class-Path" value="smack.jar, smackx.jar" />
+            </manifest>
+        </jar>
+        <bndwrap jars="${experimental.jar.name}" output="${experimental.jar.name}" />
+        <jar file="${experimental.jar.name}" update="true">
+            <manifest>
+                <attribute name="Bundle-SymbolicName" value="${bundle.name}-experimental" />
+                <attribute name="Bundle-Version" value="${version}" />
+                <attribute name="Fragment-Host" value="${bundle.name};bundle-version=${experimental.version}" />
+            </manifest>
+        </jar>
+
     <!--
     	<delete file="${compile.dir}/META-INF/smack-config.xml" />
         <delete file="${compile.dir}/META-INF/*.providers" />

build/eclipse/classpath

@@ -6,7 +6,10 @@
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="src" path="test-unit"/>
 	<classpathentry kind="src" path="workgroup/source"/>
-	<classpathentry kind="lib" path="build/ant-contrib.jar"/>
+	<classpathentry kind="src" path="experimental/source"/>
+	<classpathentry kind="src" path="experimental/test"/>
+	<classpathentry kind="src" path="workgroup/resources"/>
+	<classpathentry kind="src" path="experimental/resources"/>
 	<classpathentry kind="lib" path="build/asm.jar"/>
 	<classpathentry kind="lib" path="build/build/java-xmlbuilder-0.3.jar"/>
 	<classpathentry kind="lib" path="build/build/xmlunit.jar"/>

build/eclipse/project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>smack-3.3.x</name>
+	<name>smack-3.4.x</name>
 	<comment></comment>
 	<projects>
 	</projects>

build/release.xml

@@ -42,6 +42,7 @@
             <fileset dir="${jar.dest.dir}" includes="smackx-debug-${version}.jar" />
 			<fileset dir="${jar.dest.dir}" includes="smackx-jingle-${version}.jar" />
 			<fileset dir="${jar.dest.dir}" includes="smackx-workgroup-${version}.jar" />
+			<fileset dir="${jar.dest.dir}" includes="smackx-experimental-${experimental.version}.jar" />
         </copy>
         <copy todir="${release.samples.dir}">
             <fileset dir="${basedir}/build/resources/META-INF" includes="sample.providers" />