Phase 1 of large refactoring. Removing dead code, bug fixes, updates to JDK 1.5.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4511 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -24,8 +24,14 @@
     <!-- PROPERTIES -->
     <!-- ======================================================================================= -->
 
-    <property file="${basedir}/build/build.properties" />
+    <!-- Smack Version -->
+    <property name="version.major" value="3" />
+    <property name="version.minor" value="0" />
+    <property name="version.revision" value="0" />
 
+    <property name="version.name" value="${version.major}.${version.minor}.${version.revision}" />
+
+    <property file="${basedir}/build/build.properties" />
     <property name="compile.dir" value="${basedir}/classes" />
     <property name="compile.test.dir" value="${basedir}/classes-test" />
     <property name="jar.dest.dir" value="${basedir}" />
@@ -35,11 +41,6 @@
     <property name="test.dir" value="${basedir}/test" />
     <property name="resources.dir" value="${basedir}/build/resources" />
 
-    <property name="version.major" value="2" />
-    <property name="version.minor" value="2" />
-    <property name="version.revision" value="1" />
-    <property name="version.name" value="${version.major}.${version.minor}.${version.revision}" />
-
     <!-- Test props - override these defaults in the properties file or in command line -->
     <property name="test.host" value="localhost" />
     <property name="test.port" value="5222" />
@@ -78,8 +79,8 @@
             destdir="${compile.dir}"
             includeAntRuntime="no"
             debug="on"
-            source="1.3"
-            target="1.2"
+            source="1.5"
+            target="1.5"
         >
             <src path="${basedir}/source" />
             <classpath>
@@ -102,8 +103,8 @@
             destdir="${compile.test.dir}"
             includeAntRuntime="no"
             debug="on"
-            source="1.3"
-            target="1.2"
+            source="1.5"
+            target="1.5"
         >
             <src path="${test.dir}" />
             <classpath>

build/projects/Smack.iml

@@ -8,7 +8,8 @@
     <content url="file://$MODULE_DIR$/../..">
       <sourceFolder url="file://$MODULE_DIR$/../resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../source" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/../../release" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

build/projects/Smack.ipr

@@ -201,7 +201,7 @@
       <module fileurl="file://$PROJECT_DIR$/Smack.iml" filepath="$PROJECT_DIR$/Smack.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="JDK 1.4.2" />
+  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="JDK 1.5.0" />
   <component name="RmicSettings">
     <option name="IS_EANABLED" value="false" />
     <option name="DEBUGGING_INFO" value="true" />