dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #41682
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21254: Codestyle fixes
------------------------------------------------------------
revno: 21254
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-12-01 18:19:15 +0100
message:
Codestyle fixes
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApproval.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflow.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflowService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValue.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/log/Log4JLogConfigInitializer.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApproval.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApproval.java 2015-11-30 03:36:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApproval.java 2015-12-01 17:19:15 +0000
@@ -38,7 +38,6 @@
import org.hisp.dhis.common.view.DetailedView;
import org.hisp.dhis.common.view.ExportView;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.user.User;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalService.java 2015-11-30 03:36:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalService.java 2015-12-01 17:19:15 +0000
@@ -29,17 +29,14 @@
*/
import java.util.List;
-import java.util.Set;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
/**
* @author Jim Grace
- * @version $Id$
*/
public interface DataApprovalService
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStore.java 2015-11-30 03:36:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStore.java 2015-12-01 17:19:15 +0000
@@ -30,7 +30,6 @@
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflow.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflow.java 2015-11-30 03:36:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflow.java 2015-12-01 17:19:15 +0000
@@ -45,7 +45,6 @@
import org.hisp.dhis.period.PeriodType;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
@@ -66,8 +65,6 @@
public class DataApprovalWorkflow
extends BaseIdentifiableObject
{
- private static final long serialVersionUID = 7717119142689479930L;
-
/**
* The period type for approving data with this workflow
*/
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflowService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflowService.java 2015-11-30 03:36:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflowService.java 2015-12-01 17:19:15 +0000
@@ -28,16 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.dataelement.DataElementCategory;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.hierarchy.HierarchyViolationException;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
-import org.hisp.dhis.user.User;
-
import java.util.List;
-import java.util.Map;
-import java.util.Set;
/**
* @author Jim Grace
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValue.java 2015-12-01 16:23:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValue.java 2015-12-01 17:19:15 +0000
@@ -171,8 +171,7 @@
@Override
public String toString()
{
- return "[Tracked attribute=" + attribute + ", entityInstance=" + entityInstance + ", value='" + getValue() + "'"
- + "]";
+ return "[Tracked attribute=" + attribute + ", entityInstance=" + entityInstance + ", value='" + getValue() + "']";
}
// -------------------------------------------------------------------------
@@ -180,10 +179,11 @@
// -------------------------------------------------------------------------
/**
- * Retrieves the encrypted value if the attribute is confidential.
- * If the value is not confidential, returns old value (Should be null unless it was
- * confidential at an earlier stage)
- * @return String with decrypted value or null
+ * Retrieves the encrypted value if the attribute is confidential. If the
+ * value is not confidential, returns old value. Should be null unless it was
+ * confidential at an earlier stage.
+ *
+ * @return String with decrypted value or null.
*/
@JsonIgnore
public String getEncryptedValue()
@@ -191,19 +191,17 @@
return (getAttribute().getConfidential() && this.value != null ? this.value : this.encryptedValue);
}
- /**
- * Used by hibernate to set the object's value
- */
public void setEncryptedValue( String encryptedValue )
{
this.encryptedValue = encryptedValue;
}
/**
- * Retrieves the plaintext value is the attribute isn't confidential.
- * If the value is confidential, this value should be null, unless it was non-confidential at
- * an earlier stage.
- * @return String with plaintext value or null
+ * Retrieves the plain-text value is the attribute isn't confidential. If
+ * the value is confidential, this value should be null, unless it was
+ * non-confidential at an earlier stage.
+ *
+ * @return String with plain-text value or null.
*/
@JsonIgnore
public String getPlainValue()
@@ -211,17 +209,16 @@
return (!getAttribute().getConfidential() && this.value != null ? this.value : this.plainValue);
}
- /**
- * Used by hibernate to set the objects value
- */
public void setPlainValue( String plainValue )
{
this.plainValue = plainValue;
}
/**
- * Returns the encrypted or the plaintext value, based on the attribute's confidential value.
- * @return String with value, either plaintext or decrypted
+ * Returns the encrypted or the plain-text value, based on the attribute's
+ * confidential value.
+ *
+ * @return String with value, either plain-text or decrypted.
*/
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@@ -232,9 +229,10 @@
}
/**
- * Since we never can be 100% certain Attribute is not null, we store the value in a temporary
- * variable. The getEncrypted and getPlaintext methods will handle this value when someone requires it
- * (Either a user or hibernate)
+ * Since we never can be 100% certain Attribute is not null, we store the
+ * value in a temporary variable. The getEncrypted and getPlaintext methods
+ * will handle this value when requested.
+ *
* @param value the value to be stored
*/
public void setValue( String value )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java 2015-12-01 16:23:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java 2015-12-01 17:19:15 +0000
@@ -67,8 +67,7 @@
@Transactional
public void execute()
{
- executeSql(
- "update dataelement set domaintype='AGGREGATE' where domaintype='aggregate' or domaintype is null;" );
+ executeSql( "update dataelement set domaintype='AGGREGATE' where domaintype='aggregate' or domaintype is null;" );
executeSql( "update dataelement set domaintype='TRACKER' where domaintype='patient';" );
executeSql( "update users set invitation = false where invitation is null" );
executeSql( "alter table dataelement alter column domaintype set not null;" );
@@ -105,25 +104,15 @@
{
try
{
-
- String smtpPassword = oldPBEStringEncryptor
- .decrypt( statementManager.getHolder()
- .queryForString( "SELECT smptpassword FROM configuration" ) );
- String remoteServerPassword = oldPBEStringEncryptor.decrypt(
- statementManager.getHolder()
- .queryForString( "SELECT remoteserverpassword FROM configuration" ) );
-
- executeSql(
- "UPDATE configuration SET smtppassword = '" +
- newPBEStringEncryptor.encrypt( smtpPassword ) + "'" );
- executeSql(
- "UPDATE configuration SET remotepassword = '" +
- newPBEStringEncryptor.encrypt( remoteServerPassword ) +
- "'" );
-
+ String smtpPassword = oldPBEStringEncryptor.decrypt( statementManager.getHolder().
+ queryForString( "SELECT smptpassword FROM configuration" ) );
+ String remoteServerPassword = oldPBEStringEncryptor.decrypt( statementManager.getHolder()
+ .queryForString( "SELECT remoteserverpassword FROM configuration" ) );
+
+ executeSql( "UPDATE configuration SET smtppassword = '" + newPBEStringEncryptor.encrypt( smtpPassword ) + "'" );
+ executeSql( "UPDATE configuration SET remotepassword = '" + newPBEStringEncryptor.encrypt( remoteServerPassword ) + "'" );
executeSql( "ALTER TABLE configuration DROP COLUMN smptpassword" );
executeSql( "ALTER TABLE configuration DROP COLUMN remoteserverpassword" );
-
}
catch ( Exception ex )
{
@@ -203,29 +192,19 @@
executeSql( "update dataelement set valuetype='NUMBER' where valuetype='int' and numbertype='number'" );
executeSql( "update dataelement set valuetype='INTEGER' where valuetype='int' and numbertype='int'" );
- executeSql(
- "update dataelement set valuetype='INTEGER_POSITIVE' where valuetype='int' and numbertype='posInt'" );
- executeSql(
- "update dataelement set valuetype='INTEGER_POSITIVE' where valuetype='int' and numbertype='positiveNumber'" );
- executeSql(
- "update dataelement set valuetype='INTEGER_NEGATIVE' where valuetype='int' and numbertype='negInt'" );
- executeSql(
- "update dataelement set valuetype='INTEGER_NEGATIVE' where valuetype='int' and numbertype='negativeNumber'" );
- executeSql(
- "update dataelement set valuetype='INTEGER_ZERO_OR_POSITIVE' where valuetype='int' and numbertype='zeroPositiveInt'" );
- executeSql(
- "update dataelement set valuetype='PERCENTAGE' where valuetype='int' and numbertype='percentage'" );
- executeSql(
- "update dataelement set valuetype='UNIT_INTERVAL' where valuetype='int' and numbertype='unitInterval'" );
+ executeSql( "update dataelement set valuetype='INTEGER_POSITIVE' where valuetype='int' and numbertype='posInt'" );
+ executeSql( "update dataelement set valuetype='INTEGER_POSITIVE' where valuetype='int' and numbertype='positiveNumber'" );
+ executeSql( "update dataelement set valuetype='INTEGER_NEGATIVE' where valuetype='int' and numbertype='negInt'" );
+ executeSql( "update dataelement set valuetype='INTEGER_NEGATIVE' where valuetype='int' and numbertype='negativeNumber'" );
+ executeSql( "update dataelement set valuetype='INTEGER_ZERO_OR_POSITIVE' where valuetype='int' and numbertype='zeroPositiveInt'" );
+ executeSql( "update dataelement set valuetype='PERCENTAGE' where valuetype='int' and numbertype='percentage'" );
+ executeSql( "update dataelement set valuetype='UNIT_INTERVAL' where valuetype='int' and numbertype='unitInterval'" );
executeSql( "update dataelement set valuetype='NUMBER' where valuetype='int' and numbertype is null" );
-
executeSql( "alter table dataelement drop column numbertype" );
-
+
executeSql( "update dataelement set valuetype='TEXT' where valuetype='string' and texttype='text'" );
- executeSql(
- "update dataelement set valuetype='LONG_TEXT' where valuetype='string' and texttype='longText'" );
+ executeSql( "update dataelement set valuetype='LONG_TEXT' where valuetype='string' and texttype='longText'" );
executeSql( "update dataelement set valuetype='TEXT' where valuetype='string' and texttype is null" );
-
executeSql( "alter table dataelement drop column texttype" );
executeSql( "update dataelement set valuetype='DATE' where valuetype='date'" );
@@ -237,8 +216,7 @@
executeSql( "update dataelement set valuetype='NUMBER' where valuetype is null" );
executeSql( "update trackedentityattribute set valuetype='TEXT' where valuetype='string'" );
- executeSql(
- "update trackedentityattribute set valuetype='PHONE_NUMBER' where valuetype='phoneNumber'" );
+ executeSql( "update trackedentityattribute set valuetype='PHONE_NUMBER' where valuetype='phoneNumber'" );
executeSql( "update trackedentityattribute set valuetype='EMAIL' where valuetype='email'" );
executeSql( "update trackedentityattribute set valuetype='NUMBER' where valuetype='number'" );
executeSql( "update trackedentityattribute set valuetype='NUMBER' where valuetype='int'" );
@@ -248,13 +226,11 @@
executeSql( "update trackedentityattribute set valuetype='DATE' where valuetype='date'" );
executeSql( "update trackedentityattribute set valuetype='TEXT' where valuetype='optionSet'" );
executeSql( "update trackedentityattribute set valuetype='TEXT' where valuetype='OPTION_SET'" );
- executeSql(
- "update trackedentityattribute set valuetype='TRACKER_ASSOCIATE' where valuetype='trackerAssociate'" );
+ executeSql( "update trackedentityattribute set valuetype='TRACKER_ASSOCIATE' where valuetype='trackerAssociate'" );
executeSql( "update trackedentityattribute set valuetype='USERNAME' where valuetype='users'" );
executeSql( "update trackedentityattribute set valuetype='TEXT' where valuetype is null" );
executeSql( "update optionset set valuetype='TEXT' where valuetype is null" );
-
executeSql( "update attribute set valuetype='TEXT' where valuetype='string'" );
executeSql( "update attribute set valuetype='LONG_TEXT' where valuetype='text'" );
executeSql( "update attribute set valuetype='BOOLEAN' where valuetype='bool'" );
@@ -274,12 +250,9 @@
String autoIncr = statementBuilder.getAutoIncrementValue();
String insertSql =
- "insert into programstagedataelement(programstagedataelementid,programstageid,dataelementid,compulsory,allowprovidedelsewhere,sort_order,displayinreports,programstagesectionid,allowfuturedate,section_sort_order) "
- + "select "
- + autoIncr
- +
- ",programstageid,dataelementid,compulsory,allowprovidedelsewhere,sort_order,displayinreports,programstagesectionid,allowfuturedate,section_sort_order "
- + "from programstage_dataelements";
+ "insert into programstagedataelement(programstagedataelementid,programstageid,dataelementid,compulsory,allowprovidedelsewhere," +
+ "sort_order,displayinreports,programstagesectionid,allowfuturedate,section_sort_order) " + "select " + autoIncr +
+ ",programstageid,dataelementid,compulsory,allowprovidedelsewhere,sort_order,displayinreports,programstagesectionid,allowfuturedate,section_sort_order from programstage_dataelements";
executeSql( insertSql );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml 2015-11-27 12:35:51 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml 2015-12-01 17:19:15 +0000
@@ -15,25 +15,25 @@
<property name="systemId" column="systemid" />
<many-to-one name="feedbackRecipients" class="org.hisp.dhis.user.UserGroup"
- column="feedbackrecipientsid" foreign-key="fk_configuration_feedback_recipients" />
+ column="feedbackrecipientsid" foreign-key="fk_configuration_feedback_recipients" />
<many-to-one name="offlineOrganisationUnitLevel" class="org.hisp.dhis.organisationunit.OrganisationUnitLevel"
- column="offlineorgunitlevelid" foreign-key="fk_configuration_offline_orgunit_level" />
+ column="offlineorgunitlevelid" foreign-key="fk_configuration_offline_orgunit_level" />
<many-to-one name="infrastructuralIndicators" class="org.hisp.dhis.indicator.IndicatorGroup"
- column="infrastructuralindicatorsid" foreign-key="fk_configuration_infrastructural_indicators" />
+ column="infrastructuralindicatorsid" foreign-key="fk_configuration_infrastructural_indicators" />
<many-to-one name="infrastructuralDataElements" class="org.hisp.dhis.dataelement.DataElementGroup"
- column="infrastructuraldataelementsid" foreign-key="fk_configuration_infrastructural_dataelements" />
+ column="infrastructuraldataelementsid" foreign-key="fk_configuration_infrastructural_dataelements" />
<many-to-one name="infrastructuralPeriodType" class="org.hisp.dhis.period.PeriodType"
- column="infrastructuralperiodtypeid" foreign-key="fk_configuration_infrastructural_periodtype" />
+ column="infrastructuralperiodtypeid" foreign-key="fk_configuration_infrastructural_periodtype" />
<many-to-one name="selfRegistrationRole" class="org.hisp.dhis.user.UserAuthorityGroup"
- column="selfregistrationrole" foreign-key="fk_configuration_selfregistrationrole" />
+ column="selfregistrationrole" foreign-key="fk_configuration_selfregistrationrole" />
<many-to-one name="selfRegistrationOrgUnit" class="org.hisp.dhis.organisationunit.OrganisationUnit"
- column="selfRegistrationOrgUnit" foreign-key="fk_configuration_selfregistrationorgunit" />
+ column="selfRegistrationOrgUnit" foreign-key="fk_configuration_selfregistrationorgunit" />
<property name="remoteServerUrl" column="remoteserverurl" />
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2015-11-24 07:06:45 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2015-12-01 17:19:15 +0000
@@ -69,7 +69,6 @@
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.program.ProgramStage;
import org.hisp.dhis.program.ProgramStageDataElement;
-import org.hisp.dhis.program.ProgramTrackedEntityAttribute;
import org.hisp.dhis.program.ProgramValidation;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaService;
@@ -1255,28 +1254,6 @@
dataElementOperands.forEach( dataElementOperandService::deleteDataElementOperand );
}
- private List<ProgramTrackedEntityAttribute> extractProgramTrackedEntityAttributes( T object )
- {
- List<ProgramTrackedEntityAttribute> programTrackedEntityAttributeSet = new ArrayList<>();
-
- if ( ReflectionUtils.isCollection( "programAttributes", object, ProgramTrackedEntityAttribute.class ) )
- {
- List<ProgramTrackedEntityAttribute> programTrackedEntityAttributes = ReflectionUtils.invokeGetterMethod(
- "programAttributes", object );
-
- if ( programTrackedEntityAttributes == null )
- {
- programTrackedEntityAttributes = new ArrayList<>();
- ReflectionUtils.invokeSetterMethod( "programAttributes", object, programTrackedEntityAttributes );
- }
-
- programTrackedEntityAttributeSet.addAll( programTrackedEntityAttributes );
- programTrackedEntityAttributes.clear();
- }
-
- return programTrackedEntityAttributeSet;
- }
-
private List<DataDimensionItem> extractDataDimensionItems( T object )
{
List<DataDimensionItem> dataDimensionItems = new ArrayList<>();
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml 2015-12-01 16:36:57 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml 2015-12-01 17:19:15 +0000
@@ -96,10 +96,10 @@
<property name="defaultValue" value="J7GhAs287hsSQlKd9g5" />
</bean>
-
<!-- Encryption -->
<!-- Bouncy Castle Crypto APIs -->
+
<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<property name="staticMethod" value="java.security.Security.addProvider" />
<property name="arguments">
@@ -109,8 +109,7 @@
</property>
</bean>
-
- <!-- Deprecated encryption, but can't be removed!! Needed for systems that still uses it. -->
+ <!-- Deprecated encryption, still needed for legacy systems -->
<bean id="hibernateStringEncryptor" class="org.jasypt.hibernate4.encryptor.HibernatePBEStringEncryptor">
<property name="registeredName" value="strongHibernateStringEncryptor" />
@@ -128,8 +127,8 @@
<constructor-arg type="java.lang.String" value="H7g0oLkEw3wf52fs52g3hbG" />
</bean>
- <!-- New stronger string encryption -->
- <!-- Requires BouncyCastle api -->
+ <!-- New stronger string encryption, requires BouncyCastle API -->
+
<bean id="hibernateStrongStringEncryptor" class="org.jasypt.hibernate4.encryptor.HibernatePBEStringEncryptor">
<property name="registeredName" value="strongStringEncryptor" />
<property name="encryptor" ref="strongStringEncryptor" />
@@ -144,4 +143,4 @@
<bean id="org.jasypt.salt.RandomSaltGenerator" class="org.jasypt.salt.RandomSaltGenerator"></bean>
- </beans>
\ No newline at end of file
+</beans>
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/log/Log4JLogConfigInitializer.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/log/Log4JLogConfigInitializer.java 2015-06-09 11:09:22 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/log/Log4JLogConfigInitializer.java 2015-12-01 17:19:15 +0000
@@ -91,7 +91,7 @@
configureRootLogger( GENERAL_LOGGER_FILENAME );
}
-
+
/**
* Configures rolling file loggers.
*
