=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml	2011-05-02 14:48:05 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml	2011-05-11 07:32:33 +0000
@@ -25,11 +25,11 @@
     </property>
 
     <property name="shortName">
-      <column name="shortname" not-null="true" unique="true" length="25" />
+      <column name="shortname" not-null="true" unique="true" length="30" />
     </property>
 
     <property name="code">
-      <column name="code" not-null="false" unique="false" length="100" />
+      <column name="code" not-null="false" unique="false" length="30" />
     </property>
 
     <property name="description" type="text" />

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml	2011-05-08 22:34:28 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml	2011-05-11 07:32:33 +0000
@@ -18,9 +18,9 @@
 
     <property name="name" not-null="true" unique="true" length="230" />
 
-    <property name="shortName" unique="true" length="60" />
+    <property name="shortName" unique="true" length="30" />
 
-    <property name="code" unique="true" length="60" />
+    <property name="code" unique="true" length="30" />
 
     <many-to-one name="periodType" lazy="false" class="org.hisp.dhis.period.PeriodType" column="periodtypeid"
       not-null="true" foreign-key="fk_dataset_periodtypeid" />

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml	2011-04-30 10:05:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml	2011-05-11 07:32:33 +0000
@@ -25,11 +25,11 @@
     </property>
 
     <property name="shortName">
-      <column name="shortname" not-null="true" unique="true" length="25" />
+      <column name="shortname" not-null="true" unique="true" length="30" />
     </property>
 
     <property name="code">
-      <column name="code" not-null="false" unique="false" length="25" />
+      <column name="code" not-null="false" unique="false" length="30" />
     </property>
 
     <property name="description" type="text" />

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2011-04-30 09:28:32 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2011-05-11 07:32:33 +0000
@@ -29,11 +29,11 @@
       foreign-key="fk_parentid" index="in_parentid" />
 
     <property name="shortName">
-      <column name="shortname" not-null="true" unique="false" length="50" />
+      <column name="shortname" not-null="true" unique="false" length="30" />
     </property>
 
     <property name="code">
-      <column name="code" not-null="false" unique="false" length="25" />
+      <column name="code" not-null="false" unique="false" length="30" />
     </property>
 
     <property name="openingDate" column="openingdate" type="date" />

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2011-04-12 18:13:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2011-05-11 07:32:33 +0000
@@ -137,12 +137,12 @@
 			"required" : true,
 			"alphanumericwithbasicpuncspaces" : true,
 			"firstletteralphabet" : false,
-			"rangelength" : [ 2, 20 ]
+			"rangelength" : [ 2, 25 ]
 		},
 		"code" : {
 			"alphanumericwithbasicpuncspaces" : true,
 			"notOnlyDigits" : false,
-			"rangelength" : [ 4, 40 ]
+			"rangelength" : [ 0, 25 ]
 		},
 		"frequencySelect" : {
 			"required" : true
@@ -198,7 +198,7 @@
 		},
 		"shortName" : {
 			"required" : true,
-			"rangelength" : [ 2, 20 ],
+			"rangelength" : [ 2, 25 ],
 			"alphanumericwithbasicpuncspaces" : true,
 			"notOnlyDigits" : true
 		},
@@ -208,7 +208,7 @@
 			"notOnlyDigits" : true
 		},
 		"code" : {
-			"rangelength" : [ 3, 40 ],
+			"rangelength" : [ 0, 25 ],
 			"alphanumericwithbasicpuncspaces" : true,
 			"notOnlyDigits" : false
 		},
@@ -285,7 +285,7 @@
 		},
 		"shortName" : {
 			"required" : true,
-			"rangelength" : [ 2, 20 ],
+			"rangelength" : [ 2, 25 ],
 			"alphanumericwithbasicpuncspaces" : true,
 			"firstletteralphabet" : true
 		},
@@ -295,7 +295,7 @@
 			"firstletteralphabet" : true
 		},
 		"code" : {
-			"rangelength" : [ 3, 25 ],
+			"rangelength" : [ 0, 25 ],
 			"alphanumericwithbasicpuncspaces" : true,
 			"notOnlyDigits" : false
 		},