dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #05815
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1832: Some Spring 3 fixes. Applied generics to FactoryBeans.
------------------------------------------------------------
revno: 1832
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Mon 2010-05-10 19:50:39 +0200
message:
Some Spring 3 fixes. Applied generics to FactoryBeans.
removed:
resources/util/tomcat
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/minmax/hibernate/HibernateMinMaxDataElementStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationMappingService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeleteHandler.java
dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/framework/XPathFilter.java
dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/reader/DefaultXMLEventReader.java
dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/transformer/TransformerTaskTest.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/ConnectionPropertyFactoryBean.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java
dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/interceptor/I18nTranslationInterceptor.java
dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/configuration/JdbcConfigurationFactoryBean.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/StatementBuilderFactoryBean.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/OrganisationUnitHierarchyRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/database/DatabaseInfoProviderTest.java
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/deletion/DeletionManagerTest.java
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/AggregatableDataElementFilterTest.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/DeleteCurrentUserAction.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-services/dhis-service-core/src/main/java/org/hisp/dhis/minmax/hibernate/HibernateMinMaxDataElementStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/minmax/hibernate/HibernateMinMaxDataElementStore.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/minmax/hibernate/HibernateMinMaxDataElementStore.java 2010-05-10 17:50:39 +0000
@@ -30,7 +30,7 @@
import java.util.Collection;
import java.util.Collections;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.hibernate.HibernateGenericStore;
@@ -52,17 +52,17 @@
public MinMaxDataElement get( Source source, DataElement dataElement, DataElementCategoryOptionCombo optionCombo )
{
return (MinMaxDataElement) getCriteria(
- Expression.eq( "source", source ),
- Expression.eq( "dataElement", dataElement ),
- Expression.eq( "optionCombo", optionCombo ) ).uniqueResult();
+ Restrictions.eq( "source", source ),
+ Restrictions.eq( "dataElement", dataElement ),
+ Restrictions.eq( "optionCombo", optionCombo ) ).uniqueResult();
}
@SuppressWarnings( "unchecked" )
public Collection<MinMaxDataElement> get( Source source, DataElement dataElement )
{
return getCriteria(
- Expression.eq( "source", source ),
- Expression.eq( "dataElement", dataElement ) ).list();
+ Restrictions.eq( "source", source ),
+ Restrictions.eq( "dataElement", dataElement ) ).list();
}
@SuppressWarnings( "unchecked" )
@@ -74,7 +74,7 @@
}
return getCriteria(
- Expression.eq( "source", source ),
- Expression.in( "dataElement", dataElements ) ).list();
+ Restrictions.eq( "source", source ),
+ Restrictions.in( "dataElement", dataElements ) ).list();
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java 2010-05-10 17:50:39 +0000
@@ -158,7 +158,6 @@
* @param date The date to assign to the organisation unit hierarchy
* @return Id of the organisation unit hierarchy
*/
- @SuppressWarnings( "unchecked" )
public int addOrganisationUnitHierarchy( Date date )
{
Session session = sessionFactory.getCurrentSession();
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationMappingService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationMappingService.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationMappingService.java 2010-05-10 17:50:39 +0000
@@ -414,9 +414,7 @@
String tmpFromQuery = "";
String tmpWhereQuery = " where ";
- String query = "";
-
-
+
String curAliasDataValue = null;
String curAliasProgramStageInstance = null;
String curAliasPatientAttributeValue = null;
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeleteHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeleteHandler.java 2010-04-23 13:37:06 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeleteHandler.java 2010-05-10 17:50:39 +0000
@@ -27,11 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patient.Patient;
-import org.hisp.dhis.patient.PatientIdentifier;
-import org.hisp.dhis.patient.PatientIdentifierService;
-import org.hisp.dhis.source.Source;
import org.hisp.dhis.system.deletion.DeletionHandler;
/**
=== modified file 'dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/framework/XPathFilter.java'
--- dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/framework/XPathFilter.java 2010-04-29 22:42:08 +0000
+++ dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/framework/XPathFilter.java 2010-05-10 17:50:39 +0000
@@ -1,28 +1,21 @@
package org.amplecode.staxwax.framework;
-import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/*
* Copyright (c) 2004-2005, University of Oslo
=== modified file 'dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/reader/DefaultXMLEventReader.java'
--- dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/reader/DefaultXMLEventReader.java 2010-02-19 18:38:02 +0000
+++ dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/reader/DefaultXMLEventReader.java 2010-05-10 17:50:39 +0000
@@ -3,13 +3,13 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.stax2.XMLEventReader2;
=== modified file 'dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/transformer/TransformerTaskTest.java'
--- dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/transformer/TransformerTaskTest.java 2010-02-19 18:38:02 +0000
+++ dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/transformer/TransformerTaskTest.java 2010-05-10 17:50:39 +0000
@@ -28,9 +28,9 @@
*/
import java.io.InputStream;
-import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
+
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLStreamException;
@@ -39,7 +39,9 @@
import javax.xml.transform.TransformerException;
import javax.xml.transform.stax.StAXResult;
import javax.xml.transform.stream.StreamSource;
+
import junit.framework.TestCase;
+
import org.amplecode.staxwax.framework.XMLPipe;
import org.junit.Test;
@@ -59,8 +61,6 @@
private TransformerTask tt;
- private StringWriter sb;
-
// -------------------------------------------------------------------------
// Fixture
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/ConnectionPropertyFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/ConnectionPropertyFactoryBean.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/ConnectionPropertyFactoryBean.java 2010-05-10 17:50:39 +0000
@@ -34,7 +34,7 @@
* @version $Id$
*/
public class ConnectionPropertyFactoryBean
- implements FactoryBean
+ implements FactoryBean<String>
{
// -------------------------------------------------------------------------
// Dependencies
@@ -58,13 +58,13 @@
// FactoryBean implementation
// -------------------------------------------------------------------------
- public Object getObject()
+ public String getObject()
throws Exception
{
return hibernateConfigurationProvider.getConfiguration().getProperty( hibernateProperty );
}
- public Class<?> getObjectType()
+ public Class<String> getObjectType()
{
return String.class;
}
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java 2010-05-10 17:50:39 +0000
@@ -35,7 +35,7 @@
* @version $Id$
*/
public class HibernateMappingDirectoryLocationsFactoryBean
- implements FactoryBean
+ implements FactoryBean<Object[]>
{
// -------------------------------------------------------------------------
// Dependencies
@@ -52,14 +52,13 @@
// FactoryBean implementation
// -------------------------------------------------------------------------
- public Object getObject()
+ public Object[] getObject()
throws Exception
{
return hibernateConfigurationProvider.getDirectoryResources().toArray();
}
- @SuppressWarnings("unchecked")
- public Class getObjectType()
+ public Class<Resource> getObjectType()
{
return Resource.class;
}
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java 2010-05-10 17:50:39 +0000
@@ -35,7 +35,7 @@
* @version $Id$
*/
public class HibernateMappingJarLocationsFactoryBean
- implements FactoryBean
+ implements FactoryBean<Object[]>
{
// -------------------------------------------------------------------------
// Dependencies
@@ -52,14 +52,13 @@
// FactoryBean implementation
// -------------------------------------------------------------------------
- public Object getObject()
+ public Object[] getObject()
throws Exception
{
return hibernateConfigurationProvider.getJarResources().toArray();
}
- @SuppressWarnings("unchecked")
- public Class getObjectType()
+ public Class<Resource> getObjectType()
{
return Resource.class;
}
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java 2010-05-10 17:50:39 +0000
@@ -36,7 +36,7 @@
* @version $Id$
*/
public class HibernatePropertiesFactoryBean
- implements FactoryBean
+ implements FactoryBean<Properties>
{
// -------------------------------------------------------------------------
// Dependencies
@@ -53,14 +53,13 @@
// FactoryBean implementation
// -------------------------------------------------------------------------
- public Object getObject()
+ public Properties getObject()
throws Exception
{
return hibernateConfigurationProvider.getConfiguration().getProperties();
}
- @SuppressWarnings("unchecked")
- public Class getObjectType()
+ public Class<Properties> getObjectType()
{
return Properties.class;
}
=== modified file 'dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/interceptor/I18nTranslationInterceptor.java'
--- dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/interceptor/I18nTranslationInterceptor.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/interceptor/I18nTranslationInterceptor.java 2010-05-10 17:50:39 +0000
@@ -27,11 +27,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.common.IdentifiableObject;
+import org.aspectj.lang.JoinPoint;
import org.hisp.dhis.i18n.I18nService;
-import org.hisp.dhis.system.util.TimeUtils;
-
-import org.aspectj.lang.JoinPoint;
/**
* @author Lars Helge Overland
=== modified file 'dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java'
--- dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java 2010-05-10 17:50:39 +0000
@@ -180,7 +180,6 @@
return locales;
}
- @SuppressWarnings( "unchecked" )
public Translation getTranslation( String className, Locale locale, String property, String value, int nonId )
{
Session session = sessionFactory.getCurrentSession();
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/configuration/JdbcConfigurationFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/configuration/JdbcConfigurationFactoryBean.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/configuration/JdbcConfigurationFactoryBean.java 2010-05-10 17:50:39 +0000
@@ -38,7 +38,7 @@
* @version $Id: DefaultJDBCConfigurationProvider.java 5714 2008-09-17 13:05:36Z larshelg $
*/
public class JdbcConfigurationFactoryBean
- implements FactoryBean
+ implements FactoryBean<JdbcConfiguration>
{
private static final String KEY_DIALECT = "hibernate.dialect";
private static final String KEY_DRIVER = "hibernate.connection.driver_class";
@@ -111,13 +111,13 @@
// FactoryBean implementation
// -------------------------------------------------------------------------
- public Object getObject()
+ public JdbcConfiguration getObject()
throws Exception
{
return jdbcConfiguration;
}
- public Class<?> getObjectType()
+ public Class<JdbcConfiguration> getObjectType()
{
return JdbcConfiguration.class;
}
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/StatementBuilderFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/StatementBuilderFactoryBean.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/StatementBuilderFactoryBean.java 2010-05-10 17:50:39 +0000
@@ -37,7 +37,7 @@
* @version $Id$
*/
public class StatementBuilderFactoryBean
- implements FactoryBean
+ implements FactoryBean<StatementBuilder>
{
// -------------------------------------------------------------------------
// Dependencies
@@ -86,13 +86,13 @@
// FactoryBean implementation
// -------------------------------------------------------------------------
- public Object getObject()
+ public StatementBuilder getObject()
throws Exception
{
return statementBuilder;
}
- public Class<?> getObjectType()
+ public Class<StatementBuilder> getObjectType()
{
return StatementBuilder.class;
}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/OrganisationUnitHierarchyRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/OrganisationUnitHierarchyRowMapper.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/OrganisationUnitHierarchyRowMapper.java 2010-05-10 17:50:39 +0000
@@ -37,9 +37,9 @@
* @version $Id$
*/
public class OrganisationUnitHierarchyRowMapper
- implements RowMapper
+ implements RowMapper<Integer[]>
{
- public Object mapRow( ResultSet resultSet, int count )
+ public Integer[] mapRow( ResultSet resultSet, int count )
throws SQLException
{
return new Integer[] { resultSet.getInt( "organisationunitid" ), resultSet.getInt( "parentid" ) };
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/database/DatabaseInfoProviderTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/database/DatabaseInfoProviderTest.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/database/DatabaseInfoProviderTest.java 2010-05-10 17:50:39 +0000
@@ -31,7 +31,6 @@
import org.hisp.dhis.DhisSpringTest;
import org.junit.Test;
-import org.springframework.test.annotation.NotTransactional;
/**
* @author Lars Helge Overland
@@ -57,7 +56,6 @@
// -------------------------------------------------------------------------
@Test
- @NotTransactional
public void testGetDatabaseInfo()
{
DatabaseInfo info = provider.getDatabaseInfo();
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/deletion/DeletionManagerTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/deletion/DeletionManagerTest.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/deletion/DeletionManagerTest.java 2010-05-10 17:50:39 +0000
@@ -30,7 +30,6 @@
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.dataelement.DataElement;
import org.junit.Test;
-import org.springframework.test.annotation.NotTransactional;
/**
* @author Lars Helge Overland
@@ -52,7 +51,6 @@
}
@Test
- @NotTransactional
public void testDeletionManager()
{
deletionManager.addDeletionHandler( new DummyDeletionHandler() );
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/AggregatableDataElementFilterTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/AggregatableDataElementFilterTest.java 2009-11-21 16:44:08 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/AggregatableDataElementFilterTest.java 2010-05-10 17:50:39 +0000
@@ -9,7 +9,6 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.system.util.FilterUtils;
import org.junit.Test;
-import org.springframework.test.annotation.NotTransactional;
/**
* @author Lars Helge Overland
@@ -19,7 +18,6 @@
extends DhisTest
{
@Test
- @NotTransactional
public void filter()
{
DataElement elementA = createDataElement( 'A' );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/DeleteCurrentUserAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/DeleteCurrentUserAction.java 2010-04-21 10:42:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/DeleteCurrentUserAction.java 2010-05-10 17:50:39 +0000
@@ -51,14 +51,6 @@
this.userService = userService;
}
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
private I18n i18n;
public void setI18n( I18n i18n )
=== removed file 'resources/util/tomcat'
--- resources/util/tomcat 2010-04-23 13:44:48 +0000
+++ resources/util/tomcat 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-TOMCAT_LOCAL=/usr/local/lib/tomcat
-DHIS2_SOURCE_HOME=~/dev/src/dhis2
-
-case $1 in
-start)
- ${TOMCAT_LOCAL}/bin/startup.sh
- ;;
-stop)
- ${TOMCAT_LOCAL}/bin/shutdown.sh
- ;;
-restart)
- ${TOMCAT_LOCAL}/bin/startup.sh
- ${TOMCAT_LOCAL}/bin/shutdown.sh
- ;;
-log)
- tail -f ${TOMCAT_LOCAL}/logs/catalina.out
- ;;
-update)
- sudo rm -rf ${TOMCAT_LOCAL}/webapps/dhis
- sudo rm ${TOMCAT_LOCAL}/webapps/dhis.war
- sudo cp ${DHIS2_SOURCE_HOME}/dhis-2/dhis-web/dhis-web-portal/target/dhis.war ${TOMCAT_LOCAL}/webapps/
- echo Tomcat updated with latest WAR from src code
- ;;
-esac
-exit 0
-
