From 98978dd248c5980074fa2b483af7e1e32161e634 Mon Sep 17 00:00:00 2001 From: Kavoos Bojnourdi Date: Sun, 16 Aug 2015 10:41:29 +0200 Subject: [PATCH] Separate tests from the application --- gitignore/gitignore | 17 ++++++++++++ .../src/com/edf/gde}/base/BaseTest.java | 2 +- .../com/edf/gde/dao/AttributeDaoClient.java | 0 .../src}/com/edf/gde/dao/BaseDao.java | 0 .../com/edf/gde/dao/ProfileDaoClient.java | 0 .../src}/com/edf/gde/dao/StudyDaoClient.java | 0 .../src}/com/edf/gde/dao/UserDaoClient.java | 0 projects/GDE-test/src/gde/test/GDETest.java | 19 +++++++++++++ .../test => GDE-test/src}/restapi/Base64.java | 0 .../src}/restapi/DefaultResponseHandler.java | 0 .../src}/restapi/ResponseHandler.java | 0 .../src}/restapi/RestContext.java | 0 .../src}/restapi/SimpleRestApi.java | 0 .../exceptions/RestResponseException.java | 0 .../providers/CertificateProvider.java | 0 .../providers/FileCertificateProvider.java | 0 .../edf/gde/test/dao/AttributeDaoTest.java | 2 +- .../com/edf/gde/test/dao/ProfileDaoTest.java | 2 +- .../com/edf/gde/test/dao/StudyDaoTest.java | 2 +- .../com/edf/gde/test/dao/UserDaoTest.java | 2 +- .../gde/transferables/AttributeGroupTO.java | 0 .../edf/gde/transferables/AttributeTO.java | 0 .../com/edf/gde/transferables/ChunkTO.java | 0 .../com/edf/gde/transferables/CommandTO.java | 0 .../com/edf/gde/transferables/FileTO.java | 0 .../com/edf/gde/transferables/GroupTO.java | 0 .../com/edf/gde/transferables/LongListTO.java | 0 .../gde/transferables/ProfileAttributeTO.java | 0 .../com/edf/gde/transferables/ProfileTO.java | 0 .../com/edf/gde/transferables/StudyTO.java | 0 .../com/edf/gde/transferables/UserTO.java | 0 .../responses/CommandResultTO.java | 0 .../responses/ObjectCreationResponseTO.java | 0 .../GDE_App/GDE-ejb/nbproject/build-impl.xml | 27 +++++++++++++++---- .../GDE-ejb/nbproject/genfiles.properties | 6 ++--- .../GDE-ejb/nbproject/project.properties | 6 ++++- .../GDE_App/GDE-ejb/nbproject/project.xml | 11 ++++++++ .../GDE_App/GDE-war/nbproject/build-impl.xml | 9 +++++++ .../GDE-war/nbproject/genfiles.properties | 6 ++--- .../GDE-war/nbproject/project.properties | 5 +++- .../GDE_App/GDE-war/nbproject/project.xml | 12 +++++++++ 41 files changed, 110 insertions(+), 18 deletions(-) create mode 100644 gitignore/gitignore rename projects/{GDE_App/GDE-war/test/com/edf/gde/test => GDE-test/src/com/edf/gde}/base/BaseTest.java (90%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/com/edf/gde/dao/AttributeDaoClient.java (100%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/com/edf/gde/dao/BaseDao.java (100%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/com/edf/gde/dao/ProfileDaoClient.java (100%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/com/edf/gde/dao/StudyDaoClient.java (100%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/com/edf/gde/dao/UserDaoClient.java (100%) create mode 100644 projects/GDE-test/src/gde/test/GDETest.java rename projects/{GDE_App/GDE-war/test => GDE-test/src}/restapi/Base64.java (100%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/restapi/DefaultResponseHandler.java (100%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/restapi/ResponseHandler.java (100%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/restapi/RestContext.java (100%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/restapi/SimpleRestApi.java (100%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/restapi/exceptions/RestResponseException.java (100%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/restapi/providers/CertificateProvider.java (100%) rename projects/{GDE_App/GDE-war/test => GDE-test/src}/restapi/providers/FileCertificateProvider.java (100%) rename projects/{GDE_App/GDE-war => GDE-test}/test/com/edf/gde/test/dao/AttributeDaoTest.java (99%) rename projects/{GDE_App/GDE-war => GDE-test}/test/com/edf/gde/test/dao/ProfileDaoTest.java (99%) rename projects/{GDE_App/GDE-war => GDE-test}/test/com/edf/gde/test/dao/StudyDaoTest.java (98%) rename projects/{GDE_App/GDE-war => GDE-test}/test/com/edf/gde/test/dao/UserDaoTest.java (99%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/AttributeGroupTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/AttributeTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/ChunkTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/CommandTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/FileTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/GroupTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/LongListTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/ProfileAttributeTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/ProfileTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/StudyTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/UserTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/responses/CommandResultTO.java (100%) rename projects/{GDE_App/GDE-ejb/src/java => GDE-transferables/src}/com/edf/gde/transferables/responses/ObjectCreationResponseTO.java (100%) diff --git a/gitignore/gitignore b/gitignore/gitignore new file mode 100644 index 0000000..1910254 --- /dev/null +++ b/gitignore/gitignore @@ -0,0 +1,17 @@ +/projects/GDE_App/nbproject/private/ +/projects/GDE_App/GDE-ejb/nbproject/private/ +/projects/GDE_App/GDE-war/nbproject/private/ +/projects/GDE_App/GDE-ejb/build/ +/projects/GDE_App/GDE-ejb/dist/ +/projects/GDE_App/GDE-war/build/ +/projects/GDE_App/dist/ +/projects/GDE_App/build/ +/projects/GDE_App/GDE-war/dist/ +/GDE-test/nbproject/private/ +/projects/JavaApplication5/nbproject/private/ +/projects/GDE-test/nbproject/private/ +/projects/GDE-transferables/nbproject/private/ +/projects/GDE-transferables/build/ +/projects/GDE-transferables/dist/ +/projects/GDE-test/build/ +/projects/GDE-test/dist/ \ No newline at end of file diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/base/BaseTest.java b/projects/GDE-test/src/com/edf/gde/base/BaseTest.java similarity index 90% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/base/BaseTest.java rename to projects/GDE-test/src/com/edf/gde/base/BaseTest.java index 763d801..448613a 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/base/BaseTest.java +++ b/projects/GDE-test/src/com/edf/gde/base/BaseTest.java @@ -1,7 +1,7 @@ /* * (C) 2015 EDF */ -package com.edf.gde.test.base; +package com.edf.gde.base; /** * diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/AttributeDaoClient.java b/projects/GDE-test/src/com/edf/gde/dao/AttributeDaoClient.java similarity index 100% rename from projects/GDE_App/GDE-war/test/com/edf/gde/dao/AttributeDaoClient.java rename to projects/GDE-test/src/com/edf/gde/dao/AttributeDaoClient.java diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/BaseDao.java b/projects/GDE-test/src/com/edf/gde/dao/BaseDao.java similarity index 100% rename from projects/GDE_App/GDE-war/test/com/edf/gde/dao/BaseDao.java rename to projects/GDE-test/src/com/edf/gde/dao/BaseDao.java diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/ProfileDaoClient.java b/projects/GDE-test/src/com/edf/gde/dao/ProfileDaoClient.java similarity index 100% rename from projects/GDE_App/GDE-war/test/com/edf/gde/dao/ProfileDaoClient.java rename to projects/GDE-test/src/com/edf/gde/dao/ProfileDaoClient.java diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/StudyDaoClient.java b/projects/GDE-test/src/com/edf/gde/dao/StudyDaoClient.java similarity index 100% rename from projects/GDE_App/GDE-war/test/com/edf/gde/dao/StudyDaoClient.java rename to projects/GDE-test/src/com/edf/gde/dao/StudyDaoClient.java diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java b/projects/GDE-test/src/com/edf/gde/dao/UserDaoClient.java similarity index 100% rename from projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java rename to projects/GDE-test/src/com/edf/gde/dao/UserDaoClient.java diff --git a/projects/GDE-test/src/gde/test/GDETest.java b/projects/GDE-test/src/gde/test/GDETest.java new file mode 100644 index 0000000..9b56a30 --- /dev/null +++ b/projects/GDE-test/src/gde/test/GDETest.java @@ -0,0 +1,19 @@ +/* + * (C) 2015 EDF + */ +package gde.test; + +/** + * + * @author Kavoos + */ +public class GDETest { + + /** + * @param args the command line arguments + */ + public static void main(String[] args) { + // TODO code application logic here + } + +} diff --git a/projects/GDE_App/GDE-war/test/restapi/Base64.java b/projects/GDE-test/src/restapi/Base64.java similarity index 100% rename from projects/GDE_App/GDE-war/test/restapi/Base64.java rename to projects/GDE-test/src/restapi/Base64.java diff --git a/projects/GDE_App/GDE-war/test/restapi/DefaultResponseHandler.java b/projects/GDE-test/src/restapi/DefaultResponseHandler.java similarity index 100% rename from projects/GDE_App/GDE-war/test/restapi/DefaultResponseHandler.java rename to projects/GDE-test/src/restapi/DefaultResponseHandler.java diff --git a/projects/GDE_App/GDE-war/test/restapi/ResponseHandler.java b/projects/GDE-test/src/restapi/ResponseHandler.java similarity index 100% rename from projects/GDE_App/GDE-war/test/restapi/ResponseHandler.java rename to projects/GDE-test/src/restapi/ResponseHandler.java diff --git a/projects/GDE_App/GDE-war/test/restapi/RestContext.java b/projects/GDE-test/src/restapi/RestContext.java similarity index 100% rename from projects/GDE_App/GDE-war/test/restapi/RestContext.java rename to projects/GDE-test/src/restapi/RestContext.java diff --git a/projects/GDE_App/GDE-war/test/restapi/SimpleRestApi.java b/projects/GDE-test/src/restapi/SimpleRestApi.java similarity index 100% rename from projects/GDE_App/GDE-war/test/restapi/SimpleRestApi.java rename to projects/GDE-test/src/restapi/SimpleRestApi.java diff --git a/projects/GDE_App/GDE-war/test/restapi/exceptions/RestResponseException.java b/projects/GDE-test/src/restapi/exceptions/RestResponseException.java similarity index 100% rename from projects/GDE_App/GDE-war/test/restapi/exceptions/RestResponseException.java rename to projects/GDE-test/src/restapi/exceptions/RestResponseException.java diff --git a/projects/GDE_App/GDE-war/test/restapi/providers/CertificateProvider.java b/projects/GDE-test/src/restapi/providers/CertificateProvider.java similarity index 100% rename from projects/GDE_App/GDE-war/test/restapi/providers/CertificateProvider.java rename to projects/GDE-test/src/restapi/providers/CertificateProvider.java diff --git a/projects/GDE_App/GDE-war/test/restapi/providers/FileCertificateProvider.java b/projects/GDE-test/src/restapi/providers/FileCertificateProvider.java similarity index 100% rename from projects/GDE_App/GDE-war/test/restapi/providers/FileCertificateProvider.java rename to projects/GDE-test/src/restapi/providers/FileCertificateProvider.java diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/AttributeDaoTest.java b/projects/GDE-test/test/com/edf/gde/test/dao/AttributeDaoTest.java similarity index 99% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/AttributeDaoTest.java rename to projects/GDE-test/test/com/edf/gde/test/dao/AttributeDaoTest.java index f2e163d..acd352b 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/AttributeDaoTest.java +++ b/projects/GDE-test/test/com/edf/gde/test/dao/AttributeDaoTest.java @@ -4,7 +4,7 @@ package com.edf.gde.test.dao; import com.edf.gde.dao.AttributeDaoClient; -import com.edf.gde.test.base.BaseTest; +import com.edf.gde.base.BaseTest; import com.edf.gde.transferables.AttributeGroupTO; import com.edf.gde.transferables.AttributeTO; import java.util.ArrayList; diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/ProfileDaoTest.java b/projects/GDE-test/test/com/edf/gde/test/dao/ProfileDaoTest.java similarity index 99% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/ProfileDaoTest.java rename to projects/GDE-test/test/com/edf/gde/test/dao/ProfileDaoTest.java index 0ae96bc..758d545 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/ProfileDaoTest.java +++ b/projects/GDE-test/test/com/edf/gde/test/dao/ProfileDaoTest.java @@ -4,7 +4,7 @@ package com.edf.gde.test.dao; import com.edf.gde.dao.ProfileDaoClient; -import com.edf.gde.test.base.BaseTest; +import com.edf.gde.base.BaseTest; import com.edf.gde.transferables.ProfileAttributeTO; import com.edf.gde.transferables.ProfileTO; import java.util.ArrayList; diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/StudyDaoTest.java b/projects/GDE-test/test/com/edf/gde/test/dao/StudyDaoTest.java similarity index 98% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/StudyDaoTest.java rename to projects/GDE-test/test/com/edf/gde/test/dao/StudyDaoTest.java index 871d3d7..3d99f8d 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/StudyDaoTest.java +++ b/projects/GDE-test/test/com/edf/gde/test/dao/StudyDaoTest.java @@ -4,7 +4,7 @@ package com.edf.gde.test.dao; import com.edf.gde.dao.StudyDaoClient; -import com.edf.gde.test.base.BaseTest; +import com.edf.gde.base.BaseTest; import com.edf.gde.transferables.StudyTO; import java.util.Date; import org.junit.After; diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/UserDaoTest.java b/projects/GDE-test/test/com/edf/gde/test/dao/UserDaoTest.java similarity index 99% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/UserDaoTest.java rename to projects/GDE-test/test/com/edf/gde/test/dao/UserDaoTest.java index ff32d94..68d1b7e 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/UserDaoTest.java +++ b/projects/GDE-test/test/com/edf/gde/test/dao/UserDaoTest.java @@ -4,7 +4,7 @@ package com.edf.gde.test.dao; import com.edf.gde.dao.UserDaoClient; -import com.edf.gde.test.base.BaseTest; +import com.edf.gde.base.BaseTest; import com.edf.gde.transferables.GroupTO; import com.edf.gde.transferables.UserTO; import java.io.IOException; diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/AttributeGroupTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/AttributeGroupTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/AttributeGroupTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/AttributeGroupTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/AttributeTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/AttributeTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/AttributeTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/AttributeTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/ChunkTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/ChunkTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/ChunkTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/ChunkTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/CommandTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/CommandTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/CommandTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/CommandTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/FileTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/FileTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/FileTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/FileTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/GroupTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/GroupTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/GroupTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/GroupTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/LongListTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/LongListTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/LongListTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/LongListTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/ProfileAttributeTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/ProfileAttributeTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/ProfileAttributeTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/ProfileAttributeTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/ProfileTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/ProfileTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/ProfileTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/ProfileTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/StudyTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/StudyTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/StudyTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/StudyTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/UserTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/UserTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/UserTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/UserTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/responses/CommandResultTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/responses/CommandResultTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/responses/CommandResultTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/responses/CommandResultTO.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/responses/ObjectCreationResponseTO.java b/projects/GDE-transferables/src/com/edf/gde/transferables/responses/ObjectCreationResponseTO.java similarity index 100% rename from projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/responses/ObjectCreationResponseTO.java rename to projects/GDE-transferables/src/com/edf/gde/transferables/responses/ObjectCreationResponseTO.java diff --git a/projects/GDE_App/GDE-ejb/nbproject/build-impl.xml b/projects/GDE_App/GDE-ejb/nbproject/build-impl.xml index 996afa6..03f9b3f 100644 --- a/projects/GDE_App/GDE-ejb/nbproject/build-impl.xml +++ b/projects/GDE_App/GDE-ejb/nbproject/build-impl.xml @@ -780,8 +780,16 @@ exists or setup the property manually. For example like this: - - + + + + + + + + + + @@ -792,11 +800,18 @@ exists or setup the property manually. For example like this: - + + + - + + + + + + @@ -1179,7 +1194,9 @@ exists or setup the property manually. For example like this: - + + + diff --git a/projects/GDE_App/GDE-ejb/nbproject/genfiles.properties b/projects/GDE_App/GDE-ejb/nbproject/genfiles.properties index d97902b..8b50590 100644 --- a/projects/GDE_App/GDE-ejb/nbproject/genfiles.properties +++ b/projects/GDE_App/GDE-ejb/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=dd11cbd0 +build.xml.data.CRC32=3861114a build.xml.script.CRC32=e2a8c789 build.xml.stylesheet.CRC32=5910fda3@1.51.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=dd11cbd0 -nbproject/build-impl.xml.script.CRC32=fd1a82f0 +nbproject/build-impl.xml.data.CRC32=3861114a +nbproject/build-impl.xml.script.CRC32=8477a541 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.51.1 diff --git a/projects/GDE_App/GDE-ejb/nbproject/project.properties b/projects/GDE_App/GDE-ejb/nbproject/project.properties index 41ec3c9..f7684ec 100644 --- a/projects/GDE_App/GDE-ejb/nbproject/project.properties +++ b/projects/GDE_App/GDE-ejb/nbproject/project.properties @@ -35,7 +35,9 @@ j2ee.platform.wsit.classpath= j2ee.server.type=gfv3ee6 jar.compress=false jar.name=GDE-ejb.jar -javac.classpath= +jars.in.ejbjar=false +javac.classpath=\ + ${reference.GDE-transferables.jar} javac.debug=true javac.deprecation=false javac.processorpath=\ @@ -63,6 +65,8 @@ javadoc.windowtitle= meta.inf=${source.root}/conf meta.inf.excludes=sun-cmp-mappings.xml platform.active=default_platform +project.GDE-transferables=../../GDE-transferables +reference.GDE-transferables.jar=${project.GDE-transferables}/dist/GDE-transferables.jar resource.dir=setup run.test.classpath=\ ${javac.test.classpath}:\ diff --git a/projects/GDE_App/GDE-ejb/nbproject/project.xml b/projects/GDE_App/GDE-ejb/nbproject/project.xml index 312bb1d..53725ad 100644 --- a/projects/GDE_App/GDE-ejb/nbproject/project.xml +++ b/projects/GDE_App/GDE-ejb/nbproject/project.xml @@ -5,6 +5,7 @@ GDE-ejb 1.6.5 + reference.GDE-transferables.jar @@ -12,5 +13,15 @@ + + + GDE-transferables + jar + + jar + clean + jar + + diff --git a/projects/GDE_App/GDE-war/nbproject/build-impl.xml b/projects/GDE_App/GDE-war/nbproject/build-impl.xml index 1cf395f..f142641 100644 --- a/projects/GDE_App/GDE-war/nbproject/build-impl.xml +++ b/projects/GDE_App/GDE-war/nbproject/build-impl.xml @@ -854,11 +854,17 @@ exists or setup the property manually. For example like this: --> + + + + + + @@ -1006,6 +1012,7 @@ exists or setup the property manually. For example like this: + @@ -1013,6 +1020,7 @@ exists or setup the property manually. For example like this: + @@ -1427,6 +1435,7 @@ exists or setup the property manually. For example like this: --> + diff --git a/projects/GDE_App/GDE-war/nbproject/genfiles.properties b/projects/GDE_App/GDE-war/nbproject/genfiles.properties index 9989862..50fe26d 100644 --- a/projects/GDE_App/GDE-war/nbproject/genfiles.properties +++ b/projects/GDE_App/GDE-war/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=60648d1e +build.xml.data.CRC32=4fab2992 build.xml.script.CRC32=aa84c400 build.xml.stylesheet.CRC32=651128d4@1.68.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=60648d1e -nbproject/build-impl.xml.script.CRC32=c7df2aa1 +nbproject/build-impl.xml.data.CRC32=4fab2992 +nbproject/build-impl.xml.script.CRC32=ac448c9e nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1 diff --git a/projects/GDE_App/GDE-war/nbproject/project.properties b/projects/GDE_App/GDE-war/nbproject/project.properties index 3a43454..57526dc 100644 --- a/projects/GDE_App/GDE-war/nbproject/project.properties +++ b/projects/GDE_App/GDE-war/nbproject/project.properties @@ -45,7 +45,8 @@ jar.compress=false javac.classpath=\ ${file.reference.gson-2.3.1.jar}:\ ${reference.GDE-ejb.dist}:\ - ${libs.junit_4.classpath} + ${libs.junit_4.classpath}:\ + ${reference.GDE-transferables.jar} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true @@ -75,7 +76,9 @@ lib.dir=${web.docbase.dir}/WEB-INF/lib persistence.xml.dir=${conf.dir} platform.active=default_platform project.GDE-ejb=../GDE-ejb +project.GDE-transferables=../../GDE-transferables reference.GDE-ejb.dist=${project.GDE-ejb}/dist/GDE-ejb.jar +reference.GDE-transferables.jar=${project.GDE-transferables}/dist/GDE-transferables.jar resource.dir=setup run.test.classpath=\ ${javac.test.classpath}:\ diff --git a/projects/GDE_App/GDE-war/nbproject/project.xml b/projects/GDE_App/GDE-war/nbproject/project.xml index fcd9ad9..5679b7d 100644 --- a/projects/GDE_App/GDE-war/nbproject/project.xml +++ b/projects/GDE_App/GDE-war/nbproject/project.xml @@ -18,6 +18,10 @@ ${libs.junit_4.classpath} WEB-INF/lib + + ${reference.GDE-transferables.jar} + WEB-INF/lib + @@ -36,6 +40,14 @@ clean dist + + GDE-transferables + jar + + jar + clean + jar + -- 2.39.2