Index: lams_build/build.xml =================================================================== diff -u -r7dd46e937cf8eb0a24f098de9eb09054d8915f22 -r828a1678aeb5cb37eda9d53c50a75b2cab809fe6 --- lams_build/build.xml (.../build.xml) (revision 7dd46e937cf8eb0a24f098de9eb09054d8915f22) +++ lams_build/build.xml (.../build.xml) (revision 828a1678aeb5cb37eda9d53c50a75b2cab809fe6) @@ -679,13 +679,19 @@ - - + use them till migration to Wildfly 9.x + It will be placed back if deploy-cluster is run. --> + + + + + @@ -778,6 +784,52 @@ + + + ${ant.project.name}: Restoring clustering library + + + + + ${ant.project.name}: Copying configuration files + + + + + + + + + + + + + + + + ${ant.project.name}: Making Central sessions distributable + + + + + ${ant.project.name}: Zipping lams.ear into domain/tmp dir + + + Index: lams_build/conf/domain.xml =================================================================== diff -u --- lams_build/conf/domain.xml (revision 0) +++ lams_build/conf/domain.xml (revision 828a1678aeb5cb37eda9d53c50a75b2cab809fe6) @@ -0,0 +1,567 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @db.url.run@ + MySQL + utf8 + true + convertToNull + false + true + + + @db.location@ + false + false + 128K + 4 + 256K + 256K + 1M + 16K + 64K + 2K + + TRANSACTION_READ_COMMITTED + + 0 + 0 + 64 + false + false + FailingConnectionOnly + + + @db.username@ + @db.password@ + + + + true + false + false + + + 5 + 0 + + + false + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${jboss.bind.address:127.0.0.1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_build/conf/host.xml =================================================================== diff -u --- lams_build/conf/host.xml (revision 0) +++ lams_build/conf/host.xml (revision 828a1678aeb5cb37eda9d53c50a75b2cab809fe6) @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_common/src/java/org/lamsfoundation/lams/themes/dto/ThemeDTO.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r828a1678aeb5cb37eda9d53c50a75b2cab809fe6 --- lams_common/src/java/org/lamsfoundation/lams/themes/dto/ThemeDTO.java (.../ThemeDTO.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/themes/dto/ThemeDTO.java (.../ThemeDTO.java) (revision 828a1678aeb5cb37eda9d53c50a75b2cab809fe6) @@ -23,6 +23,8 @@ package org.lamsfoundation.lams.themes.dto; +import java.io.Serializable; + import org.lamsfoundation.lams.learningdesign.dto.BaseDTO; import org.lamsfoundation.lams.themes.Theme; @@ -31,7 +33,7 @@ * * @author Fiona Malikoff */ -public class ThemeDTO extends BaseDTO { +public class ThemeDTO extends BaseDTO implements Serializable { private Long id; private String name; private String description;