Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1783 → Rev 1784

/branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/CoursesService.java
1,7 → 1,7
package pt.estgp.estgweb.services.courses;
 
import com.owlike.genson.Genson;
 
import com.owlike.genson.GensonBuilder;
import com.owlike.genson.reflect.VisibilityFilter;
import jomm.dao.impl.AbstractDao;
import jomm.utils.BytesUtils;
418,7 → 418,7
 
 
private static Genson getGensonPlanoEstudos(){
Genson genson = new Genson.Builder()
Genson genson = new GensonBuilder()
.exclude("class")
.exclude("siges", Curso.class)
.exclude("nome",Curso.class)
436,7 → 436,7
 
 
private static Genson getGensonCourse(){
Genson genson = new Genson.Builder()
Genson genson = new GensonBuilder()
.exclude(Object.class)
.useFields(false)
.useMethods(true)
/branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/xsd/CursoImpl.java
28,7 → 28,7
static Genson genson;
 
static {
GensonBuilder gensonBuilder = new Genson.Builder()
GensonBuilder gensonBuilder = new GensonBuilder()
.exclude(Object.class)
 
.include(Boolean.class)
/branches/v3/impl/src/java/pt/estgp/estgweb/services/data/repositorydocuments/interfaces/RepositoryInterface.java
76,7 → 76,7
static Genson genson;
 
static {
GensonBuilder gensonBuilder = new Genson.Builder()
GensonBuilder gensonBuilder = new GensonBuilder()
.exclude(Object.class)
.include(Boolean.class)
.include(Integer.class)
/branches/v3/impl/src/java/pt/estgp/estgweb/services/data/repositorydocuments/DocumentPersons.java
1,6 → 1,7
package pt.estgp.estgweb.services.data.repositorydocuments;
 
import com.owlike.genson.Genson;
import com.owlike.genson.GensonBuilder;
import org.apache.log4j.Logger;
import pt.estgp.estgweb.services.bpmnprocess.types.BacoDataAbstractType;
 
41,7 → 42,7
return persons != null ? persons.hashCode() : 0;
}
 
static Genson genson = new Genson.Builder()
static Genson genson = new GensonBuilder()
.include(DocumentPersons.class)
.include(DocumentPerson.class)
.create();
/branches/v3/impl/src/java/pt/estgp/estgweb/services/entity/EntityServiceJson.java
1,6 → 1,7
package pt.estgp.estgweb.services.entity;
 
import com.owlike.genson.Genson;
import com.owlike.genson.GensonBuilder;
import pt.estgp.estgweb.domain.*;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.utl.ist.berserk.logic.serviceManager.IService;
14,7 → 15,7
*/
public class EntityServiceJson implements IService
{
static Genson courseUnitGenson = new Genson.Builder()
static Genson courseUnitGenson = new GensonBuilder()
.exclude(Object.class)
.include(Boolean.class)
.include(Integer.class)
30,7 → 31,7
.include("importYear", CourseUnit.class)
.create();
 
static Genson userGenson = new Genson.Builder()
static Genson userGenson = new GensonBuilder()
.exclude(Object.class)
.exclude(User.class)
.exclude(GenericUser.class)
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/RepositoryDocumentCollectionImpl.java
28,7 → 28,7
static Genson gensonSimpleFields;
 
static {
GensonBuilder gensonBuilder = new Genson.Builder()
GensonBuilder gensonBuilder = new GensonBuilder()
.exclude(Object.class)
.useMethods(false)
.include(Boolean.class)
52,7 → 52,7
 
genson = gensonBuilder.create();
 
GensonBuilder gensonBuilderSimpleFields = new Genson.Builder()
GensonBuilder gensonBuilderSimpleFields = new GensonBuilder()
.exclude(Object.class)
.include(Boolean.class)
.include(Integer.class)
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseUnitImpl.java
1006,6 → 1006,7
}
 
 
/*
private static Genson getGensonMergedTipologiasComplete(){
Genson genson = new Genson.Builder()
.exclude(Object.class)
1028,7 → 1029,7
.include("markWarning", Tipologia.class)
.create();
return genson;
}
}*/
 
public String serialize() throws IOException
{
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/RepositoryDocumentImpl.java
80,6 → 80,8
//O sistema nao constroi o RepositoryFile a partir da classe
//mas como guarda o stream quando serializar aparece outra vez o ficheiro
.include("repositoryFile", RepositoryFileProxy.class) //DIFERENCA COM O ANTERIOR
.exclude("repositoryFileVersions",RepositoryFile.class)
.exclude("sourceModule",RepositoryFile.class)
.create();
 
 
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseSchoolImpl.java
1,6 → 1,7
package pt.estgp.estgweb.domain;
 
import com.owlike.genson.Genson;
import com.owlike.genson.GensonBuilder;
import org.json.JSONException;
import org.json.JSONObject;
 
18,7 → 19,7
}
 
 
static Genson courseSchoolGenson = new Genson.Builder()
static Genson courseSchoolGenson = new GensonBuilder()
.exclude(Object.class)
.useRuntimeType(true)
.useMethods(true)
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseDepartmentImpl.java
1,6 → 1,7
package pt.estgp.estgweb.domain;
 
import com.owlike.genson.Genson;
import com.owlike.genson.GensonBuilder;
import org.json.JSONException;
import org.json.JSONObject;
import pt.estgp.estgweb.utils.ConfigProperties;
28,7 → 29,7
 
}
 
static Genson courseDepartmentGenson = new Genson.Builder()
static Genson courseDepartmentGenson = new GensonBuilder()
.exclude(Object.class)
.include(CourseDepartmentImpl.class)
.useRuntimeType(true)
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/utils/FilesUploadResult.java
2,6 → 2,7
 
 
import com.owlike.genson.Genson;
import com.owlike.genson.GensonBuilder;
import org.json.JSONException;
import org.json.JSONObject;
 
36,7 → 37,7
 
public static Genson getGenson()
{
return new Genson.Builder()
return new GensonBuilder()
.include(FilesUploadResult.class)
.include(FileUploaded.class)
.create();
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/utils/FileUploaded.java
1,6 → 1,7
package pt.estgp.estgweb.web.controllers.utils;
 
import com.owlike.genson.Genson;
import com.owlike.genson.GensonBuilder;
 
import java.io.IOException;
import java.io.Serializable;
109,7 → 110,7
 
public static Genson getGenson()
{
return new Genson.Builder()
return new GensonBuilder()
.include(FileUploaded.class)
.create();
}
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/configuration/SchedullerTasksJson.java
1,6 → 1,7
package pt.estgp.estgweb.web.controllers.configuration;
 
import com.owlike.genson.Genson;
import com.owlike.genson.GensonBuilder;
import jomm.dao.impl.AbstractDao;
import org.apache.log4j.Logger;
import pt.estgp.estgweb.domain.JobServiceTask;
78,7 → 79,7
{
JobServiceTaskImpl j = (JobServiceTaskImpl) sm.execute(RequestUtils.getRequester(request, response), "LoadJobServiceTask", args, names);
 
Genson genson = new Genson.Builder()
Genson genson = new GensonBuilder()
.exclude(Object.class)
.include(Boolean.class)
.include(Integer.class)
132,7 → 133,7
List<JobServiceTaskScheduler> tasks = (List<JobServiceTaskScheduler>) sm.execute(RequestUtils.getRequester(request, response), "LoadJobServiceTaskSchedullers", args, names);
 
 
Genson genson = new Genson.Builder()
Genson genson = new GensonBuilder()
.exclude(Object.class)
.include(Boolean.class)
.include(Integer.class)
180,7 → 181,7
 
AbstractDao.getCurrentSession().getTransaction().commit();
 
Genson genson = new Genson.Builder()
Genson genson = new GensonBuilder()
.exclude(Object.class)
.include(Boolean.class)
.include(Integer.class)
/branches/v3/impl/src/web/user/repositoryDocuments/collectionsbrowser.jsp
694,6 → 694,9
<%--<div class="col-sm-12">
<pre class="code">{{ checkedDocuments | json }}</pre>
</div>--%>
<div class="col-sm-12">
<pre class="code">{{ data | json }}</pre>
</div>
</div>