From bccd4cc0dba0f89aa045b113bac46eb8cc1dab4e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Wed, 15 Feb 2017 21:49:02 +0100 Subject: [PATCH] upd: rename package name and all references to it Change-Id: Ie1e938a864ad93732201643f42a83148dd2f137d --- .classpath | 2 +- .gitignore | 2 +- build.xml | 102 +++++++------- config/gigi.properties.template | 12 +- debian/.gitignore | 4 +- debian/changelog | 4 +- debian/control | 30 ++-- debian/copyright | 20 +-- debian/gigi-proxy.service | 4 +- debian/gigi-simple-signer.service | 4 +- debian/gigi-standalone.service | 4 +- debian/gigi.1 | 16 +-- debian/rules | 10 +- ...gi-testing.docs => wpia-gigi-testing.docs} | 0 ...wpia-gigi-testing.gigi-simple-signer.init} | 0 ...=> wpia-gigi-testing.gigi-standalone.init} | 0 ...ting.install => wpia-gigi-testing.install} | 0 ...ng.manpages => wpia-gigi-testing.manpages} | 0 ...ng.postinst => wpia-gigi-testing.postinst} | 4 +- ....templates => wpia-gigi-testing.templates} | 2 +- ...pia-gigi-testing.wpia-gigi-signer.default} | 0 ...lt => wpia-gigi-testing.wpia-gigi.default} | 0 debian/{cacert-gigi.docs => wpia-gigi.docs} | 0 ...init => wpia-gigi.gigi-simple-signer.init} | 0 ...ne.init => wpia-gigi.gigi-standalone.init} | 0 ...{cacert-gigi.install => wpia-gigi.install} | 0 ...acert-gigi.manpages => wpia-gigi.manpages} | 0 ...acert-gigi.postinst => wpia-gigi.postinst} | 4 +- ...ert-gigi.templates => wpia-gigi.templates} | 2 +- doc/beforeYouStart.txt | 4 +- doc/scripts/gigi | 10 +- natives/Makefile | 6 +- ...tUID.c => club_wpia_gigi_natives_SetUID.c} | 8 +- src/{org/cacert => club/wpia}/gigi/Gigi.java | 132 +++++++++--------- src/{org/cacert => club/wpia}/gigi/Gigi.templ | 0 .../wpia}/gigi/GigiApiException.java | 8 +- .../cacert => club/wpia}/gigi/GigiConfig.java | 2 +- .../cacert => club/wpia}/gigi/Launcher.java | 17 +-- .../wpia}/gigi/PermissionCheckable.java | 4 +- .../wpia}/gigi/PolicyRedirector.java | 2 +- .../wpia}/gigi/api/APIPoint.java | 10 +- .../wpia}/gigi/api/CATSImport.java | 8 +- .../wpia}/gigi/api/CATSResolve.java | 12 +- .../wpia}/gigi/api/CATSRestrictedApi.java | 14 +- .../wpia}/gigi/api/CreateCertificate.java | 22 +-- .../wpia}/gigi/api/EmailReping.java | 10 +- .../cacert => club/wpia}/gigi/api/Emails.java | 9 +- .../wpia}/gigi/api/FindAgent.java | 19 +-- .../wpia}/gigi/api/GigiAPI.java | 6 +- .../wpia}/gigi/api/RevokeCertificate.java | 10 +- .../wpia}/gigi/crypto/SMIME.java | 5 +- .../wpia}/gigi/crypto/SPKAC.java | 2 +- .../wpia}/gigi/database/DBEnum.java | 2 +- .../gigi/database/DatabaseConnection.java | 4 +- .../gigi/database/GigiPreparedStatement.java | 2 +- .../wpia}/gigi/database/GigiResultSet.java | 2 +- .../wpia}/gigi/database/SQLFileManager.java | 2 +- .../wpia}/gigi/database/tableStructure.sql | 0 .../wpia}/gigi/database/upgrade/from_1.sql | 0 .../wpia}/gigi/database/upgrade/from_10.sql | 0 .../wpia}/gigi/database/upgrade/from_11.sql | 0 .../wpia}/gigi/database/upgrade/from_12.sql | 0 .../wpia}/gigi/database/upgrade/from_13.sql | 0 .../wpia}/gigi/database/upgrade/from_14.sql | 0 .../wpia}/gigi/database/upgrade/from_15.sql | 0 .../wpia}/gigi/database/upgrade/from_16.sql | 0 .../wpia}/gigi/database/upgrade/from_17.sql | 0 .../wpia}/gigi/database/upgrade/from_18.sql | 0 .../wpia}/gigi/database/upgrade/from_19.sql | 0 .../wpia}/gigi/database/upgrade/from_2.sql | 0 .../wpia}/gigi/database/upgrade/from_20.sql | 0 .../wpia}/gigi/database/upgrade/from_21.sql | 0 .../wpia}/gigi/database/upgrade/from_22.sql | 0 .../wpia}/gigi/database/upgrade/from_23.sql | 0 .../wpia}/gigi/database/upgrade/from_24.sql | 0 .../wpia}/gigi/database/upgrade/from_25.sql | 0 .../wpia}/gigi/database/upgrade/from_3.sql | 0 .../wpia}/gigi/database/upgrade/from_4.sql | 0 .../wpia}/gigi/database/upgrade/from_5.sql | 0 .../wpia}/gigi/database/upgrade/from_6.sql | 0 .../wpia}/gigi/database/upgrade/from_7.sql | 0 .../wpia}/gigi/database/upgrade/from_8.sql | 0 .../wpia}/gigi/database/upgrade/from_9.sql | 0 .../wpia}/gigi/dbObjects/Assurance.java | 6 +- .../wpia}/gigi/dbObjects/CACertificate.java | 8 +- .../wpia}/gigi/dbObjects/CATS.java | 8 +- .../wpia}/gigi/dbObjects/Certificate.java | 18 +-- .../gigi/dbObjects/CertificateOwner.java | 8 +- .../gigi/dbObjects/CertificateProfile.java | 6 +- .../wpia}/gigi/dbObjects/Country.java | 10 +- .../wpia}/gigi/dbObjects/Digest.java | 9 +- .../wpia}/gigi/dbObjects/Domain.java | 10 +- .../dbObjects/DomainPingConfiguration.java | 12 +- .../gigi/dbObjects/DomainPingExecution.java | 4 +- .../wpia}/gigi/dbObjects/DomainPingType.java | 4 +- .../wpia}/gigi/dbObjects/EmailAddress.java | 18 +-- .../wpia}/gigi/dbObjects/Group.java | 12 +- .../wpia}/gigi/dbObjects/IdCachable.java | 2 +- .../wpia}/gigi/dbObjects/Job.java | 12 +- .../wpia}/gigi/dbObjects/Name.java | 18 +-- .../wpia}/gigi/dbObjects/NamePart.java | 8 +- .../wpia}/gigi/dbObjects/ObjectCache.java | 2 +- .../wpia}/gigi/dbObjects/Organisation.java | 14 +- .../dbObjects/SupportNotificationMail.templ | 0 .../SupportUserNotificationMail.templ | 0 .../wpia}/gigi/dbObjects/SupportedUser.java | 24 ++-- .../wpia}/gigi/dbObjects/User.java | 32 ++--- .../wpia}/gigi/dbObjects/Verifyable.java | 4 +- .../dbObjects/wrappers/DataContainer.java | 2 +- .../wpia}/gigi/email/EmailProvider.java | 12 +- .../wpia}/gigi/email/MailProbe.java | 8 +- .../wpia}/gigi/email/MailProbe.templ | 0 .../wpia}/gigi/email/SendMail.java | 8 +- .../wpia}/gigi/localisation/Language.java | 2 +- .../wpia}/gigi/natives/SetUID.java | 2 +- .../wpia}/gigi/output/ArrayIterable.java | 6 +- .../wpia}/gigi/output/AssurancesDisplay.java | 14 +- .../wpia}/gigi/output/AssurancesDisplay.templ | 0 .../gigi/output/CertificateIterable.java | 12 +- .../wpia}/gigi/output/CertificateTable.templ | 0 .../output/CertificateValiditySelector.java | 10 +- .../wpia}/gigi/output/ClientCSRGenerate.java | 8 +- .../wpia}/gigi/output/ClientCSRGenerate.templ | 0 .../wpia}/gigi/output/CountrySelector.java | 14 +- .../wpia}/gigi/output/CountrySelector.templ | 0 .../wpia}/gigi/output/DateSelector.java | 14 +- .../wpia}/gigi/output/GroupIterator.java | 8 +- .../wpia}/gigi/output/GroupSelector.java | 12 +- .../wpia}/gigi/output/HashAlgorithms.java | 8 +- .../wpia}/gigi/output/IMenuItem.java | 6 +- .../wpia}/gigi/output/IterableIterable.java | 6 +- .../wpia}/gigi/output/Menu.java | 6 +- .../wpia}/gigi/output/MenuCollector.java | 6 +- .../wpia}/gigi/output/NameInput.java | 18 +-- .../wpia}/gigi/output/NameInput.templ | 0 .../wpia}/gigi/output/PageMenuItem.java | 6 +- .../wpia}/gigi/output/SimpleMenuItem.java | 4 +- .../output/SimpleUntranslatedMenuItem.java | 6 +- .../wpia}/gigi/output/TrustchainIterable.java | 8 +- .../output/template/ForeachStatement.java | 4 +- .../wpia}/gigi/output/template/Form.java | 10 +- .../gigi/output/template/IfStatement.java | 4 +- .../gigi/output/template/IterableDataset.java | 4 +- .../gigi/output/template/MailFooter.templ | 0 .../gigi/output/template/MailTemplate.java | 6 +- .../template/OutputVariableCommand.java | 4 +- .../gigi/output/template/Outputable.java | 4 +- .../template/OutputableArrayIterable.java | 4 +- .../gigi/output/template/PlainOutputable.java | 6 +- .../wpia}/gigi/output/template/Scope.java | 4 +- .../gigi/output/template/SprintfCommand.java | 6 +- .../wpia}/gigi/output/template/Template.java | 12 +- .../gigi/output/template/TemplateBlock.java | 4 +- .../template/TemplateParseException.java | 2 +- .../gigi/output/template/Translatable.java | 2 +- .../output/template/TranslateCommand.java | 6 +- .../wpia}/gigi/pages/AboutPage.java | 6 +- .../wpia}/gigi/pages/AboutPage.templ | 0 .../wpia}/gigi/pages/HandlesMixedRequest.java | 2 +- .../wpia}/gigi/pages/LoginPage.java | 34 ++--- .../wpia}/gigi/pages/LoginPage.templ | 0 .../wpia}/gigi/pages/LogoutPage.java | 6 +- .../wpia}/gigi/pages/MainPage.java | 4 +- .../wpia}/gigi/pages/MainPage.templ | 0 .../wpia}/gigi/pages/MainPageNotLogin.templ | 0 .../wpia}/gigi/pages/ManagedFormPage.java | 4 +- .../gigi/pages/ManagedMultiFormPage.java | 6 +- .../wpia}/gigi/pages/OneFormPage.java | 6 +- .../cacert => club/wpia}/gigi/pages/Page.java | 12 +- .../wpia}/gigi/pages/PasswordResetForm.templ | 0 .../wpia}/gigi/pages/PasswordResetMail.templ | 0 .../wpia}/gigi/pages/PasswordResetPage.java | 24 ++-- .../wpia}/gigi/pages/PolicyIndex.java | 2 +- .../wpia}/gigi/pages/RootCertPage.java | 4 +- .../wpia}/gigi/pages/RootCertPage.templ | 0 .../wpia}/gigi/pages/StaticPage.java | 4 +- .../wpia}/gigi/pages/TestSecure.java | 2 +- .../wpia}/gigi/pages/Verify.java | 18 +-- .../wpia}/gigi/pages/Verify.templ | 0 .../wpia}/gigi/pages/account/ChangeForm.java | 14 +- .../pages/account/ChangePasswordForm.templ | 0 .../pages/account/ChangePasswordPage.java | 8 +- .../gigi/pages/account/FindAgentAccess.java | 16 +-- .../gigi/pages/account/FindAgentAccess.templ | 0 .../wpia}/gigi/pages/account/History.java | 10 +- .../wpia}/gigi/pages/account/History.templ | 0 .../wpia}/gigi/pages/account/MyDetails.java | 8 +- .../wpia}/gigi/pages/account/MyDetails.templ | 0 .../gigi/pages/account/MyDetailsForm.java | 28 ++-- .../gigi/pages/account/MyDetailsForm.templ | 0 .../pages/account/MyDetailsFormAssured.templ | 0 .../gigi/pages/account/MyDetailsRoles.templ | 0 .../pages/account/MyOrganisationsForm.java | 20 +-- .../pages/account/MyOrganisationsForm.templ | 0 .../wpia}/gigi/pages/account/NamesForm.templ | 0 .../gigi/pages/account/UserTrainings.java | 10 +- .../gigi/pages/account/UserTrainings.templ | 0 .../pages/account/certs/CertificateAdd.java | 8 +- .../account/certs/CertificateDisplay.templ | 0 .../account/certs/CertificateIssueForm.java | 42 +++--- .../account/certs/CertificateIssueForm.templ | 0 .../certs/CertificateModificationForm.java | 20 +-- .../certs/CertificateModificationForm.templ | 0 .../account/certs/CertificateRequest.java | 41 +++--- .../pages/account/certs/Certificates.java | 38 ++--- .../account/certs/RequestCertificate.templ | 0 .../account/certs/RevokeSingleCertForm.java | 14 +- .../account/certs/RevokeSingleCertForm.templ | 0 .../pages/account/domain/DomainAddForm.java | 16 +-- .../pages/account/domain/DomainAddForm.templ | 0 .../account/domain/DomainManagementForm.java | 18 +-- .../account/domain/DomainManagementForm.templ | 0 .../pages/account/domain/DomainOverview.java | 16 +-- .../pages/account/domain/DomainOverview.templ | 0 .../account/domain/DomainPinglogForm.java | 22 +-- .../account/domain/DomainPinglogForm.templ | 0 .../gigi/pages/account/domain/EditDomain.java | 16 +-- .../pages/account/domain/PingConfigForm.java | 26 ++-- .../pages/account/domain/PingConfigForm.templ | 0 .../gigi/pages/account/mail/MailAddForm.java | 18 +-- .../gigi/pages/account/mail/MailAddForm.templ | 0 .../account/mail/MailManagementForm.java | 20 +-- .../account/mail/MailManagementForm.templ | 0 .../gigi/pages/account/mail/MailOverview.java | 16 +-- .../pages/account/mail/MailOverview.templ | 0 .../wpia}/gigi/pages/admin/TTPAdminForm.java | 14 +- .../wpia}/gigi/pages/admin/TTPAdminForm.templ | 0 .../wpia}/gigi/pages/admin/TTPAdminPage.java | 20 +-- .../wpia}/gigi/pages/admin/TTPAdminPage.templ | 0 .../pages/admin/support/FindCertForm.java | 16 +-- .../pages/admin/support/FindCertForm.templ | 0 .../pages/admin/support/FindCertPage.java | 24 ++-- .../pages/admin/support/FindCertPage.templ | 0 .../admin/support/FindUserByDomainForm.java | 20 +-- .../admin/support/FindUserByDomainForm.templ | 0 .../admin/support/FindUserByDomainPage.java | 8 +- .../admin/support/FindUserByEmailForm.java | 14 +- .../admin/support/FindUserByEmailForm.templ | 0 .../admin/support/FindUserByEmailPage.java | 16 +-- .../support/FindUserByEmailUsertable.templ | 0 .../admin/support/SupportEnterTicketForm.java | 16 +-- .../support/SupportEnterTicketForm.templ | 0 .../admin/support/SupportEnterTicketPage.java | 12 +- .../SupportRevokeCertificatesForm.java | 20 +-- .../SupportRevokeCertificatesForm.templ | 0 .../admin/support/SupportUserDetailsForm.java | 30 ++-- .../support/SupportUserDetailsForm.templ | 0 .../admin/support/SupportUserDetailsPage.java | 24 ++-- .../support/SupportUserDetailsPage.templ | 0 .../wpia}/gigi/pages/error/AccessDenied.java | 4 +- .../wpia}/gigi/pages/error/AccessDenied.templ | 0 .../wpia}/gigi/pages/error/PageNotFound.java | 4 +- .../wpia}/gigi/pages/error/PageNotFound.templ | 0 .../wpia}/gigi/pages/main/RegisterPage.java | 10 +- .../wpia}/gigi/pages/main/RegisterPage.templ | 0 .../wpia}/gigi/pages/main/Signup.java | 44 +++--- .../wpia}/gigi/pages/main/Signup.templ | 0 .../gigi/pages/orga/AffiliationForm.java | 20 +-- .../gigi/pages/orga/AffiliationForm.templ | 0 .../wpia}/gigi/pages/orga/CreateOrgForm.java | 20 +-- .../wpia}/gigi/pages/orga/CreateOrgForm.templ | 0 .../wpia}/gigi/pages/orga/CreateOrgPage.java | 8 +- .../wpia}/gigi/pages/orga/EditOrg.templ | 0 .../gigi/pages/orga/OrgDomainAddForm.java | 16 +-- .../gigi/pages/orga/OrgDomainAddForm.templ | 0 .../wpia}/gigi/pages/orga/ViewOrgPage.java | 24 ++-- .../wpia}/gigi/pages/orga/ViewOrgs.templ | 0 .../pages/statistics/StatisticsRoles.java | 14 +- .../pages/statistics/StatisticsRoles.templ | 0 .../wpia}/gigi/pages/wot/AssuranceForm.java | 36 ++--- .../wpia}/gigi/pages/wot/AssuranceForm.templ | 0 .../wpia}/gigi/pages/wot/AssurePage.java | 22 +-- .../wpia}/gigi/pages/wot/AssureeSearch.templ | 0 .../wpia}/gigi/pages/wot/Points.java | 10 +- .../wpia}/gigi/pages/wot/Points.templ | 0 .../wpia}/gigi/pages/wot/RequestTTPForm.java | 20 +-- .../wpia}/gigi/pages/wot/RequestTTPForm.templ | 0 .../wpia}/gigi/pages/wot/RequestTTPPage.java | 14 +- .../wpia}/gigi/pages/wot/RequestTTPPage.templ | 0 .../wpia}/gigi/pages/wot/Rules.templ | 0 .../wpia}/gigi/ping/DNSPinger.java | 10 +- .../wpia}/gigi/ping/DomainPinger.java | 10 +- .../wpia}/gigi/ping/EmailPinger.java | 14 +- .../wpia}/gigi/ping/HTTPFetch.java | 8 +- .../wpia}/gigi/ping/PingerDaemon.java | 18 +-- .../wpia}/gigi/ping/SSLPinger.java | 11 +- .../wpia}/gigi/util/AuthorizationContext.java | 18 +-- .../cacert => club/wpia}/gigi/util/CAA.java | 10 +- .../wpia}/gigi/util/CalendarUtil.java | 2 +- .../wpia}/gigi/util/CertExporter.java | 7 +- .../wpia}/gigi/util/CipherInfo.java | 2 +- .../wpia}/gigi/util/DNSUtil.java | 4 +- .../wpia}/gigi/util/DayDate.java | 2 +- .../wpia}/gigi/util/DomainAssessment.java | 4 +- .../wpia}/gigi/util/EditDistance.java | 2 +- .../wpia}/gigi/util/HTMLEncoder.java | 2 +- .../wpia}/gigi/util/KeyStorage.java | 2 +- .../wpia}/gigi/util/Notary.java | 28 ++-- .../cacert => club/wpia}/gigi/util/PEM.java | 2 +- .../wpia}/gigi/util/PasswordHash.java | 2 +- .../gigi/util/PasswordStrengthChecker.java | 8 +- .../wpia}/gigi/util/PublicSuffixes.java | 2 +- .../wpia}/gigi/util/RandomToken.java | 2 +- .../wpia}/gigi/util/RateLimit.java | 4 +- .../wpia}/gigi/util/ServerConstants.java | 12 +- .../wpia}/gigi/util/SystemKeywords.java | 2 +- .../wpia}/gigi/util/TimeConditions.java | 4 +- .../gigi/util/VerificationAgentEntered.templ | 0 .../wpia}/gigi/util/VerificationEntered.templ | 0 .../wpia}/gigi/util/idn_enabled.dat | 0 .../wpia}/gigi/DomainVerification.java | 17 ++- .../cacert => club/wpia}/gigi/LoginTest.java | 15 +- .../wpia}/gigi/TestCalendarUtil.java | 7 +- .../wpia}/gigi/TestCertificate.java | 22 +-- .../wpia}/gigi/TestCrossDomainAccess.java | 17 +-- .../cacert => club/wpia}/gigi/TestDomain.java | 7 +- .../wpia}/gigi/TestLanguage.java | 11 +- .../cacert => club/wpia}/gigi/TestName.java | 11 +- .../wpia}/gigi/TestObjectCache.java | 11 +- .../cacert => club/wpia}/gigi/TestOrga.java | 15 +- .../wpia}/gigi/TestPasswordReset.java | 9 +- .../cacert => club/wpia}/gigi/TestSQL.java | 9 +- .../cacert => club/wpia}/gigi/TestSSL.java | 7 +- .../wpia}/gigi/TestSecurityHeaders.java | 5 +- .../wpia}/gigi/TestSeparateSessionScope.java | 15 +- .../cacert => club/wpia}/gigi/TestUser.java | 29 ++-- .../wpia}/gigi/TestUserGroupMembership.java | 15 +- .../wpia}/gigi/TestUserSerialize.java | 7 +- .../wpia}/gigi/api/ImportCATSResult.java | 29 ++-- .../wpia}/gigi/api/IssueCert.java | 27 ++-- .../wpia}/gigi/api/TestFindAgent.java | 30 ++-- .../wpia}/gigi/crypto/TestSPKAC.java | 5 +- .../wpia}/gigi/crypto/sampleSPKAC.txt | 0 .../wpia}/gigi/dbObjects/TestAssurance.java | 14 +- .../gigi/dbObjects/TestAssuranceMail.java | 23 +-- .../wpia}/gigi/dbObjects/TestAssureName.java | 19 ++- .../wpia}/gigi/dbObjects/TestCATS.java | 8 +- .../wpia}/gigi/dbObjects/TestCertificate.java | 11 +- .../wpia}/gigi/dbObjects/TestCountryCode.java | 10 +- .../gigi/email/TestEmailProviderClass.java | 7 +- .../wpia}/gigi/email/TestSendmail.java | 14 +- .../wpia}/gigi/pages/TestVerify.java | 11 +- .../pages/account/TestCertificateAdd.java | 18 +-- .../pages/account/TestCertificateRequest.java | 13 +- .../pages/account/TestChangePassword.java | 8 +- .../wpia}/gigi/pages/account/TestDomain.java | 9 +- .../pages/account/TestMailManagement.java | 15 +- .../gigi/pages/account/TestMyDetailsEdit.java | 18 +-- .../account/TestPasswordResetExternal.java | 17 +-- .../gigi/pages/account/TestTrainings.java | 14 +- .../admin/TestSEAdminNotificationMail.java | 21 +-- .../pages/admin/TestSEAdminPageDetails.java | 27 ++-- .../TestSEAdminPageUserDomainSearch.java | 23 +-- .../admin/TestSEAdminPageUserMailSearch.java | 21 +-- .../pages/admin/TestSEAdminTicketSetting.java | 15 +- .../gigi/pages/main/RegisterPageTest.java | 19 +-- .../wpia}/gigi/pages/orga/TestOrgDomain.java | 12 +- .../gigi/pages/orga/TestOrgManagement.java | 23 +-- .../wpia}/gigi/pages/wot/TestAssurance.java | 31 ++-- .../wpia}/gigi/pages/wot/TestTTP.java | 16 ++- .../wpia}/gigi/pages/wot/TestTTPAdmin.java | 13 +- .../wpia}/gigi/ping/TestDNS.java | 15 +- .../wpia}/gigi/ping/TestHTTP.java | 21 +-- .../wpia}/gigi/ping/TestSSL.java | 29 ++-- .../wpia}/gigi/template/TestTemplate.java | 17 +-- .../wpia}/gigi/template/TestTemplateMail.java | 11 +- .../gigi/template/TestTemplateUnescaped.java | 9 +- .../wpia}/gigi/testUtils/BusinessTest.java | 27 ++-- .../gigi/testUtils/ClientBusinessTest.java | 8 +- .../wpia}/gigi/testUtils/ClientTest.java | 4 +- .../wpia}/gigi/testUtils/ConfiguredTest.java | 38 ++--- .../wpia}/gigi/testUtils/IOUtils.java | 2 +- .../wpia}/gigi/testUtils/InitTruststore.java | 2 +- .../wpia}/gigi/testUtils/MailReceiver.java | 4 +- .../wpia}/gigi/testUtils/ManagedTest.java | 31 ++-- .../wpia}/gigi/testUtils/OrgTest.java | 12 +- .../wpia}/gigi/testUtils/PingTest.java | 11 +- .../wpia}/gigi/testUtils/RegisteredUser.java | 5 +- .../gigi/testUtils/RestrictedApiTest.java | 29 ++-- .../gigi/testUtils/TestEmailReceiver.java | 6 +- .../wpia}/gigi/util/EditDistanceTest.java | 4 +- .../wpia}/gigi/util/TestCAAValidation.java | 23 +-- .../wpia}/gigi/util/TestHTMLEncoder.java | 4 +- .../wpia}/gigi/util/TestNotary.java | 34 ++--- .../wpia}/gigi/util/TestPasswordHash.java | 4 +- .../gigi/util/TestPasswordMigration.java | 12 +- .../util/TestPasswordStrengthChecker.java | 6 +- .../wpia}/gigi/util/TestPublicSuffixes.java | 4 +- .../wpia}/gigi/util/TestPublicSuffixes.txt | 0 .../wpia}/gigi/DevelLauncher.java | 28 ++-- .../wpia}/gigi/DevelTicketWait.templ | 0 .../wpia}/gigi/GenerateProfileOverview.java | 8 +- .../wpia}/gigi/TestLauncher.java | 2 +- .../gigi/email/CommandlineEmailProvider.java | 4 +- .../gigi/email/DelegateMailProvider.java | 4 +- .../wpia}/gigi/email/TestEmailProvider.java | 2 +- .../wpia}/gigi/localisation/FileIterable.java | 2 +- .../wpia}/gigi/localisation/TaintSource.java | 2 +- .../TranslationCollectingVisitor.java | 4 +- .../localisation/TranslationCollector.java | 9 +- .../club/wpia/gigi/localisation/conf.txt | 21 +++ .../wpia}/gigi/pages/Manager.java | 64 ++++----- .../wpia}/gigi/pages/Manager.templ | 0 .../wpia}/gigi/pages/ManagerMails.templ | 0 .../wpia}/gigi/util/IOUtils.java | 2 +- .../wpia}/gigi/util/SimpleSigner.java | 27 ++-- .../org/cacert/gigi/localisation/conf.txt | 21 --- .../wpia}/gigi/util/DatabaseManager.java | 8 +- .../wpia}/gigi/util/FetchLocales.java | 2 +- .../gigi/util/HighFinancialValueFetcher.java | 2 +- .../util/HighFinancialValueFetcherAlexa.java | 2 +- .../HighFinancialValueFetcherUmbrella.java | 2 +- 412 files changed, 1914 insertions(+), 1810 deletions(-) rename debian/{cacert-gigi-testing.docs => wpia-gigi-testing.docs} (100%) rename debian/{cacert-gigi-testing.gigi-simple-signer.init => wpia-gigi-testing.gigi-simple-signer.init} (100%) rename debian/{cacert-gigi-testing.gigi-standalone.init => wpia-gigi-testing.gigi-standalone.init} (100%) rename debian/{cacert-gigi-testing.install => wpia-gigi-testing.install} (100%) rename debian/{cacert-gigi-testing.manpages => wpia-gigi-testing.manpages} (100%) rename debian/{cacert-gigi-testing.postinst => wpia-gigi-testing.postinst} (93%) rename debian/{cacert-gigi-testing.templates => wpia-gigi-testing.templates} (69%) rename debian/{cacert-gigi-testing.cacert-gigi-signer.default => wpia-gigi-testing.wpia-gigi-signer.default} (100%) rename debian/{cacert-gigi-testing.cacert-gigi.default => wpia-gigi-testing.wpia-gigi.default} (100%) rename debian/{cacert-gigi.docs => wpia-gigi.docs} (100%) rename debian/{cacert-gigi.gigi-simple-signer.init => wpia-gigi.gigi-simple-signer.init} (100%) rename debian/{cacert-gigi.gigi-standalone.init => wpia-gigi.gigi-standalone.init} (100%) rename debian/{cacert-gigi.install => wpia-gigi.install} (100%) rename debian/{cacert-gigi.manpages => wpia-gigi.manpages} (100%) rename debian/{cacert-gigi.postinst => wpia-gigi.postinst} (93%) rename debian/{cacert-gigi.templates => wpia-gigi.templates} (73%) rename natives/{org_cacert_gigi_natives_SetUID.c => club_wpia_gigi_natives_SetUID.c} (87%) rename src/{org/cacert => club/wpia}/gigi/Gigi.java (84%) rename src/{org/cacert => club/wpia}/gigi/Gigi.templ (100%) rename src/{org/cacert => club/wpia}/gigi/GigiApiException.java (94%) rename src/{org/cacert => club/wpia}/gigi/GigiConfig.java (99%) rename src/{org/cacert => club/wpia}/gigi/Launcher.java (98%) rename src/{org/cacert => club/wpia}/gigi/PermissionCheckable.java (57%) rename src/{org/cacert => club/wpia}/gigi/PolicyRedirector.java (97%) rename src/{org/cacert => club/wpia}/gigi/api/APIPoint.java (91%) rename src/{org/cacert => club/wpia}/gigi/api/CATSImport.java (91%) rename src/{org/cacert => club/wpia}/gigi/api/CATSResolve.java (85%) rename src/{org/cacert => club/wpia}/gigi/api/CATSRestrictedApi.java (78%) rename src/{org/cacert => club/wpia}/gigi/api/CreateCertificate.java (83%) rename src/{org/cacert => club/wpia}/gigi/api/EmailReping.java (85%) rename src/{org/cacert => club/wpia}/gigi/api/Emails.java (91%) rename src/{org/cacert => club/wpia}/gigi/api/FindAgent.java (91%) rename src/{org/cacert => club/wpia}/gigi/api/GigiAPI.java (93%) rename src/{org/cacert => club/wpia}/gigi/api/RevokeCertificate.java (85%) rename src/{org/cacert => club/wpia}/gigi/crypto/SMIME.java (98%) rename src/{org/cacert => club/wpia}/gigi/crypto/SPKAC.java (98%) rename src/{org/cacert => club/wpia}/gigi/database/DBEnum.java (64%) rename src/{org/cacert => club/wpia}/gigi/database/DatabaseConnection.java (99%) rename src/{org/cacert => club/wpia}/gigi/database/GigiPreparedStatement.java (99%) rename src/{org/cacert => club/wpia}/gigi/database/GigiResultSet.java (99%) rename src/{org/cacert => club/wpia}/gigi/database/SQLFileManager.java (98%) rename src/{org/cacert => club/wpia}/gigi/database/tableStructure.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_1.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_10.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_11.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_12.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_13.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_14.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_15.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_16.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_17.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_18.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_19.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_2.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_20.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_21.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_22.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_23.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_24.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_25.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_3.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_4.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_5.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_6.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_7.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_8.sql (100%) rename src/{org/cacert => club/wpia}/gigi/database/upgrade/from_9.sql (100%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/Assurance.java (93%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/CACertificate.java (97%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/CATS.java (94%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/Certificate.java (97%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/CertificateOwner.java (96%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/CertificateProfile.java (98%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/Country.java (95%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/Digest.java (76%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/Domain.java (97%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/DomainPingConfiguration.java (91%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/DomainPingExecution.java (91%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/DomainPingType.java (69%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/EmailAddress.java (94%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/Group.java (93%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/IdCachable.java (62%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/Job.java (91%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/Name.java (97%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/NamePart.java (91%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/ObjectCache.java (96%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/Organisation.java (96%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/SupportNotificationMail.templ (100%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/SupportUserNotificationMail.templ (100%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/SupportedUser.java (93%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/User.java (96%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/Verifyable.java (68%) rename src/{org/cacert => club/wpia}/gigi/dbObjects/wrappers/DataContainer.java (76%) rename src/{org/cacert => club/wpia}/gigi/email/EmailProvider.java (96%) rename src/{org/cacert => club/wpia}/gigi/email/MailProbe.java (76%) rename src/{org/cacert => club/wpia}/gigi/email/MailProbe.templ (100%) rename src/{org/cacert => club/wpia}/gigi/email/SendMail.java (96%) rename src/{org/cacert => club/wpia}/gigi/localisation/Language.java (99%) rename src/{org/cacert => club/wpia}/gigi/natives/SetUID.java (95%) rename src/{org/cacert => club/wpia}/gigi/output/ArrayIterable.java (78%) rename src/{org/cacert => club/wpia}/gigi/output/AssurancesDisplay.java (90%) rename src/{org/cacert => club/wpia}/gigi/output/AssurancesDisplay.templ (100%) rename src/{org/cacert => club/wpia}/gigi/output/CertificateIterable.java (89%) rename src/{org/cacert => club/wpia}/gigi/output/CertificateTable.templ (100%) rename src/{org/cacert => club/wpia}/gigi/output/CertificateValiditySelector.java (95%) rename src/{org/cacert => club/wpia}/gigi/output/ClientCSRGenerate.java (85%) rename src/{org/cacert => club/wpia}/gigi/output/ClientCSRGenerate.templ (100%) rename src/{org/cacert => club/wpia}/gigi/output/CountrySelector.java (85%) rename src/{org/cacert => club/wpia}/gigi/output/CountrySelector.templ (100%) rename src/{org/cacert => club/wpia}/gigi/output/DateSelector.java (93%) rename src/{org/cacert => club/wpia}/gigi/output/GroupIterator.java (81%) rename src/{org/cacert => club/wpia}/gigi/output/GroupSelector.java (86%) rename src/{org/cacert => club/wpia}/gigi/output/HashAlgorithms.java (79%) rename src/{org/cacert => club/wpia}/gigi/output/IMenuItem.java (58%) rename src/{org/cacert => club/wpia}/gigi/output/IterableIterable.java (80%) rename src/{org/cacert => club/wpia}/gigi/output/Menu.java (93%) rename src/{org/cacert => club/wpia}/gigi/output/MenuCollector.java (81%) rename src/{org/cacert => club/wpia}/gigi/output/NameInput.java (89%) rename src/{org/cacert => club/wpia}/gigi/output/NameInput.templ (100%) rename src/{org/cacert => club/wpia}/gigi/output/PageMenuItem.java (75%) rename src/{org/cacert => club/wpia}/gigi/output/SimpleMenuItem.java (80%) rename src/{org/cacert => club/wpia}/gigi/output/SimpleUntranslatedMenuItem.java (85%) rename src/{org/cacert => club/wpia}/gigi/output/TrustchainIterable.java (76%) rename src/{org/cacert => club/wpia}/gigi/output/template/ForeachStatement.java (93%) rename src/{org/cacert => club/wpia}/gigi/output/template/Form.java (97%) rename src/{org/cacert => club/wpia}/gigi/output/template/IfStatement.java (95%) rename src/{org/cacert => club/wpia}/gigi/output/template/IterableDataset.java (87%) rename src/{org/cacert => club/wpia}/gigi/output/template/MailFooter.templ (100%) rename src/{org/cacert => club/wpia}/gigi/output/template/MailTemplate.java (95%) rename src/{org/cacert => club/wpia}/gigi/output/template/OutputVariableCommand.java (91%) rename src/{org/cacert => club/wpia}/gigi/output/template/Outputable.java (88%) rename src/{org/cacert => club/wpia}/gigi/output/template/OutputableArrayIterable.java (91%) rename src/{org/cacert => club/wpia}/gigi/output/template/PlainOutputable.java (78%) rename src/{org/cacert => club/wpia}/gigi/output/template/Scope.java (90%) rename src/{org/cacert => club/wpia}/gigi/output/template/SprintfCommand.java (97%) rename src/{org/cacert => club/wpia}/gigi/output/template/Template.java (98%) rename src/{org/cacert => club/wpia}/gigi/output/template/TemplateBlock.java (89%) rename src/{org/cacert => club/wpia}/gigi/output/template/TemplateParseException.java (98%) rename src/{org/cacert => club/wpia}/gigi/output/template/Translatable.java (91%) rename src/{org/cacert => club/wpia}/gigi/output/template/TranslateCommand.java (90%) rename src/{org/cacert => club/wpia}/gigi/pages/AboutPage.java (81%) rename src/{org/cacert => club/wpia}/gigi/pages/AboutPage.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/HandlesMixedRequest.java (89%) rename src/{org/cacert => club/wpia}/gigi/pages/LoginPage.java (89%) rename src/{org/cacert => club/wpia}/gigi/pages/LoginPage.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/LogoutPage.java (88%) rename src/{org/cacert => club/wpia}/gigi/pages/MainPage.java (91%) rename src/{org/cacert => club/wpia}/gigi/pages/MainPage.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/MainPageNotLogin.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/ManagedFormPage.java (91%) rename src/{org/cacert => club/wpia}/gigi/pages/ManagedMultiFormPage.java (86%) rename src/{org/cacert => club/wpia}/gigi/pages/OneFormPage.java (91%) rename src/{org/cacert => club/wpia}/gigi/pages/Page.java (95%) rename src/{org/cacert => club/wpia}/gigi/pages/PasswordResetForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/PasswordResetMail.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/PasswordResetPage.java (89%) rename src/{org/cacert => club/wpia}/gigi/pages/PolicyIndex.java (97%) rename src/{org/cacert => club/wpia}/gigi/pages/RootCertPage.java (96%) rename src/{org/cacert => club/wpia}/gigi/pages/RootCertPage.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/StaticPage.java (90%) rename src/{org/cacert => club/wpia}/gigi/pages/TestSecure.java (95%) rename src/{org/cacert => club/wpia}/gigi/pages/Verify.java (91%) rename src/{org/cacert => club/wpia}/gigi/pages/Verify.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/ChangeForm.java (81%) rename src/{org/cacert => club/wpia}/gigi/pages/account/ChangePasswordForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/ChangePasswordPage.java (80%) rename src/{org/cacert => club/wpia}/gigi/pages/account/FindAgentAccess.java (79%) rename src/{org/cacert => club/wpia}/gigi/pages/account/FindAgentAccess.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/History.java (87%) rename src/{org/cacert => club/wpia}/gigi/pages/account/History.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/MyDetails.java (93%) rename src/{org/cacert => club/wpia}/gigi/pages/account/MyDetails.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/MyDetailsForm.java (90%) rename src/{org/cacert => club/wpia}/gigi/pages/account/MyDetailsForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/MyDetailsFormAssured.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/MyDetailsRoles.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/MyOrganisationsForm.java (85%) rename src/{org/cacert => club/wpia}/gigi/pages/account/MyOrganisationsForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/NamesForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/UserTrainings.java (87%) rename src/{org/cacert => club/wpia}/gigi/pages/account/UserTrainings.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/certs/CertificateAdd.java (80%) rename src/{org/cacert => club/wpia}/gigi/pages/account/certs/CertificateDisplay.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/certs/CertificateIssueForm.java (87%) rename src/{org/cacert => club/wpia}/gigi/pages/account/certs/CertificateIssueForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/certs/CertificateModificationForm.java (84%) rename src/{org/cacert => club/wpia}/gigi/pages/account/certs/CertificateModificationForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/certs/CertificateRequest.java (96%) rename src/{org/cacert => club/wpia}/gigi/pages/account/certs/Certificates.java (91%) rename src/{org/cacert => club/wpia}/gigi/pages/account/certs/RequestCertificate.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/certs/RevokeSingleCertForm.java (74%) rename src/{org/cacert => club/wpia}/gigi/pages/account/certs/RevokeSingleCertForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/domain/DomainAddForm.java (80%) rename src/{org/cacert => club/wpia}/gigi/pages/account/domain/DomainAddForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/domain/DomainManagementForm.java (83%) rename src/{org/cacert => club/wpia}/gigi/pages/account/domain/DomainManagementForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/domain/DomainOverview.java (79%) rename src/{org/cacert => club/wpia}/gigi/pages/account/domain/DomainOverview.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/domain/DomainPinglogForm.java (83%) rename src/{org/cacert => club/wpia}/gigi/pages/account/domain/DomainPinglogForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/domain/EditDomain.java (83%) rename src/{org/cacert => club/wpia}/gigi/pages/account/domain/PingConfigForm.java (92%) rename src/{org/cacert => club/wpia}/gigi/pages/account/domain/PingConfigForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/mail/MailAddForm.java (72%) rename src/{org/cacert => club/wpia}/gigi/pages/account/mail/MailAddForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/mail/MailManagementForm.java (87%) rename src/{org/cacert => club/wpia}/gigi/pages/account/mail/MailManagementForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/account/mail/MailOverview.java (84%) rename src/{org/cacert => club/wpia}/gigi/pages/account/mail/MailOverview.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/TTPAdminForm.java (77%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/TTPAdminForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/TTPAdminPage.java (87%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/TTPAdminPage.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/FindCertForm.java (86%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/FindCertForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/FindCertPage.java (83%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/FindCertPage.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/FindUserByDomainForm.java (82%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/FindUserByDomainForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/FindUserByDomainPage.java (80%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/FindUserByEmailForm.java (79%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/FindUserByEmailForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/FindUserByEmailPage.java (86%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/FindUserByEmailUsertable.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/SupportEnterTicketForm.java (82%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/SupportEnterTicketForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/SupportEnterTicketPage.java (86%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/SupportRevokeCertificatesForm.java (86%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/SupportUserDetailsForm.java (84%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/SupportUserDetailsForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/SupportUserDetailsPage.java (89%) rename src/{org/cacert => club/wpia}/gigi/pages/admin/support/SupportUserDetailsPage.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/error/AccessDenied.java (88%) rename src/{org/cacert => club/wpia}/gigi/pages/error/AccessDenied.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/error/PageNotFound.java (93%) rename src/{org/cacert => club/wpia}/gigi/pages/error/PageNotFound.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/main/RegisterPage.java (88%) rename src/{org/cacert => club/wpia}/gigi/pages/main/RegisterPage.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/main/Signup.java (87%) rename src/{org/cacert => club/wpia}/gigi/pages/main/Signup.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/orga/AffiliationForm.java (83%) rename src/{org/cacert => club/wpia}/gigi/pages/orga/AffiliationForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/orga/CreateOrgForm.java (90%) rename src/{org/cacert => club/wpia}/gigi/pages/orga/CreateOrgForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/orga/CreateOrgPage.java (81%) rename src/{org/cacert => club/wpia}/gigi/pages/orga/EditOrg.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/orga/OrgDomainAddForm.java (71%) rename src/{org/cacert => club/wpia}/gigi/pages/orga/OrgDomainAddForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/orga/ViewOrgPage.java (87%) rename src/{org/cacert => club/wpia}/gigi/pages/orga/ViewOrgs.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/statistics/StatisticsRoles.java (85%) rename src/{org/cacert => club/wpia}/gigi/pages/statistics/StatisticsRoles.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/wot/AssuranceForm.java (90%) rename src/{org/cacert => club/wpia}/gigi/pages/wot/AssuranceForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/wot/AssurePage.java (87%) rename src/{org/cacert => club/wpia}/gigi/pages/wot/AssureeSearch.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/wot/Points.java (91%) rename src/{org/cacert => club/wpia}/gigi/pages/wot/Points.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/wot/RequestTTPForm.java (77%) rename src/{org/cacert => club/wpia}/gigi/pages/wot/RequestTTPForm.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/wot/RequestTTPPage.java (87%) rename src/{org/cacert => club/wpia}/gigi/pages/wot/RequestTTPPage.templ (100%) rename src/{org/cacert => club/wpia}/gigi/pages/wot/Rules.templ (100%) rename src/{org/cacert => club/wpia}/gigi/ping/DNSPinger.java (89%) rename src/{org/cacert => club/wpia}/gigi/ping/DomainPinger.java (89%) rename src/{org/cacert => club/wpia}/gigi/ping/EmailPinger.java (75%) rename src/{org/cacert => club/wpia}/gigi/ping/HTTPFetch.java (90%) rename src/{org/cacert => club/wpia}/gigi/ping/PingerDaemon.java (90%) rename src/{org/cacert => club/wpia}/gigi/ping/SSLPinger.java (98%) rename src/{org/cacert => club/wpia}/gigi/util/AuthorizationContext.java (87%) rename src/{org/cacert => club/wpia}/gigi/util/CAA.java (94%) rename src/{org/cacert => club/wpia}/gigi/util/CalendarUtil.java (97%) rename src/{org/cacert => club/wpia}/gigi/util/CertExporter.java (98%) rename src/{org/cacert => club/wpia}/gigi/util/CipherInfo.java (99%) rename src/{org/cacert => club/wpia}/gigi/util/DNSUtil.java (97%) rename src/{org/cacert => club/wpia}/gigi/util/DayDate.java (98%) rename src/{org/cacert => club/wpia}/gigi/util/DomainAssessment.java (98%) rename src/{org/cacert => club/wpia}/gigi/util/EditDistance.java (98%) rename src/{org/cacert => club/wpia}/gigi/util/HTMLEncoder.java (90%) rename src/{org/cacert => club/wpia}/gigi/util/KeyStorage.java (96%) rename src/{org/cacert => club/wpia}/gigi/util/Notary.java (95%) rename src/{org/cacert => club/wpia}/gigi/util/PEM.java (96%) rename src/{org/cacert => club/wpia}/gigi/util/PasswordHash.java (99%) rename src/{org/cacert => club/wpia}/gigi/util/PasswordStrengthChecker.java (94%) rename src/{org/cacert => club/wpia}/gigi/util/PublicSuffixes.java (99%) rename src/{org/cacert => club/wpia}/gigi/util/RandomToken.java (95%) rename src/{org/cacert => club/wpia}/gigi/util/RateLimit.java (96%) rename src/{org/cacert => club/wpia}/gigi/util/ServerConstants.java (91%) rename src/{org/cacert => club/wpia}/gigi/util/SystemKeywords.java (92%) rename src/{org/cacert => club/wpia}/gigi/util/TimeConditions.java (97%) rename src/{org/cacert => club/wpia}/gigi/util/VerificationAgentEntered.templ (100%) rename src/{org/cacert => club/wpia}/gigi/util/VerificationEntered.templ (100%) rename src/{org/cacert => club/wpia}/gigi/util/idn_enabled.dat (100%) rename tests/{org/cacert => club/wpia}/gigi/DomainVerification.java (87%) rename tests/{org/cacert => club/wpia}/gigi/LoginTest.java (93%) rename tests/{org/cacert => club/wpia}/gigi/TestCalendarUtil.java (95%) rename tests/{org/cacert => club/wpia}/gigi/TestCertificate.java (91%) rename tests/{org/cacert => club/wpia}/gigi/TestCrossDomainAccess.java (91%) rename tests/{org/cacert => club/wpia}/gigi/TestDomain.java (95%) rename tests/{org/cacert => club/wpia}/gigi/TestLanguage.java (93%) rename tests/{org/cacert => club/wpia}/gigi/TestName.java (96%) rename tests/{org/cacert => club/wpia}/gigi/TestObjectCache.java (87%) rename tests/{org/cacert => club/wpia}/gigi/TestOrga.java (86%) rename tests/{org/cacert => club/wpia}/gigi/TestPasswordReset.java (93%) rename tests/{org/cacert => club/wpia}/gigi/TestSQL.java (84%) rename tests/{org/cacert => club/wpia}/gigi/TestSSL.java (96%) rename tests/{org/cacert => club/wpia}/gigi/TestSecurityHeaders.java (90%) rename tests/{org/cacert => club/wpia}/gigi/TestSeparateSessionScope.java (91%) rename tests/{org/cacert => club/wpia}/gigi/TestUser.java (90%) rename tests/{org/cacert => club/wpia}/gigi/TestUserGroupMembership.java (93%) rename tests/{org/cacert => club/wpia}/gigi/TestUserSerialize.java (92%) rename tests/{org/cacert => club/wpia}/gigi/api/ImportCATSResult.java (87%) rename tests/{org/cacert => club/wpia}/gigi/api/IssueCert.java (88%) rename tests/{org/cacert => club/wpia}/gigi/api/TestFindAgent.java (86%) rename tests/{org/cacert => club/wpia}/gigi/crypto/TestSPKAC.java (96%) rename tests/{org/cacert => club/wpia}/gigi/crypto/sampleSPKAC.txt (100%) rename tests/{org/cacert => club/wpia}/gigi/dbObjects/TestAssurance.java (96%) rename tests/{org/cacert => club/wpia}/gigi/dbObjects/TestAssuranceMail.java (96%) rename tests/{org/cacert => club/wpia}/gigi/dbObjects/TestAssureName.java (76%) rename tests/{org/cacert => club/wpia}/gigi/dbObjects/TestCATS.java (90%) rename tests/{org/cacert => club/wpia}/gigi/dbObjects/TestCertificate.java (78%) rename tests/{org/cacert => club/wpia}/gigi/dbObjects/TestCountryCode.java (92%) rename tests/{org/cacert => club/wpia}/gigi/email/TestEmailProviderClass.java (93%) rename tests/{org/cacert => club/wpia}/gigi/email/TestSendmail.java (93%) rename tests/{org/cacert => club/wpia}/gigi/pages/TestVerify.java (90%) rename tests/{org/cacert => club/wpia}/gigi/pages/account/TestCertificateAdd.java (97%) rename tests/{org/cacert => club/wpia}/gigi/pages/account/TestCertificateRequest.java (90%) rename tests/{org/cacert => club/wpia}/gigi/pages/account/TestChangePassword.java (95%) rename tests/{org/cacert => club/wpia}/gigi/pages/account/TestDomain.java (89%) rename tests/{org/cacert => club/wpia}/gigi/pages/account/TestMailManagement.java (95%) rename tests/{org/cacert => club/wpia}/gigi/pages/account/TestMyDetailsEdit.java (93%) rename tests/{org/cacert => club/wpia}/gigi/pages/account/TestPasswordResetExternal.java (88%) rename tests/{org/cacert => club/wpia}/gigi/pages/account/TestTrainings.java (77%) rename tests/{org/cacert => club/wpia}/gigi/pages/admin/TestSEAdminNotificationMail.java (93%) rename tests/{org/cacert => club/wpia}/gigi/pages/admin/TestSEAdminPageDetails.java (91%) rename tests/{org/cacert => club/wpia}/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java (84%) rename tests/{org/cacert => club/wpia}/gigi/pages/admin/TestSEAdminPageUserMailSearch.java (94%) rename tests/{org/cacert => club/wpia}/gigi/pages/admin/TestSEAdminTicketSetting.java (75%) rename tests/{org/cacert => club/wpia}/gigi/pages/main/RegisterPageTest.java (95%) rename tests/{org/cacert => club/wpia}/gigi/pages/orga/TestOrgDomain.java (92%) rename tests/{org/cacert => club/wpia}/gigi/pages/orga/TestOrgManagement.java (95%) rename tests/{org/cacert => club/wpia}/gigi/pages/wot/TestAssurance.java (95%) rename tests/{org/cacert => club/wpia}/gigi/pages/wot/TestTTP.java (77%) rename tests/{org/cacert => club/wpia}/gigi/pages/wot/TestTTPAdmin.java (85%) rename tests/{org/cacert => club/wpia}/gigi/ping/TestDNS.java (91%) rename tests/{org/cacert => club/wpia}/gigi/ping/TestHTTP.java (93%) rename tests/{org/cacert => club/wpia}/gigi/ping/TestSSL.java (94%) rename tests/{org/cacert => club/wpia}/gigi/template/TestTemplate.java (93%) rename tests/{org/cacert => club/wpia}/gigi/template/TestTemplateMail.java (87%) rename tests/{org/cacert => club/wpia}/gigi/template/TestTemplateUnescaped.java (88%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/BusinessTest.java (90%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/ClientBusinessTest.java (74%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/ClientTest.java (94%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/ConfiguredTest.java (90%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/IOUtils.java (98%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/InitTruststore.java (88%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/MailReceiver.java (70%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/ManagedTest.java (96%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/OrgTest.java (68%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/PingTest.java (92%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/RegisteredUser.java (90%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/RestrictedApiTest.java (79%) rename tests/{org/cacert => club/wpia}/gigi/testUtils/TestEmailReceiver.java (98%) rename tests/{org/cacert => club/wpia}/gigi/util/EditDistanceTest.java (96%) rename tests/{org/cacert => club/wpia}/gigi/util/TestCAAValidation.java (81%) rename tests/{org/cacert => club/wpia}/gigi/util/TestHTMLEncoder.java (90%) rename tests/{org/cacert => club/wpia}/gigi/util/TestNotary.java (91%) rename tests/{org/cacert => club/wpia}/gigi/util/TestPasswordHash.java (90%) rename tests/{org/cacert => club/wpia}/gigi/util/TestPasswordMigration.java (80%) rename tests/{org/cacert => club/wpia}/gigi/util/TestPasswordStrengthChecker.java (93%) rename tests/{org/cacert => club/wpia}/gigi/util/TestPublicSuffixes.java (97%) rename tests/{org/cacert => club/wpia}/gigi/util/TestPublicSuffixes.txt (100%) rename util-testing/{org/cacert => club/wpia}/gigi/DevelLauncher.java (93%) rename util-testing/{org/cacert => club/wpia}/gigi/DevelTicketWait.templ (100%) rename util-testing/{org/cacert => club/wpia}/gigi/GenerateProfileOverview.java (94%) rename util-testing/{org/cacert => club/wpia}/gigi/TestLauncher.java (91%) rename util-testing/{org/cacert => club/wpia}/gigi/email/CommandlineEmailProvider.java (92%) rename util-testing/{org/cacert => club/wpia}/gigi/email/DelegateMailProvider.java (94%) rename util-testing/{org/cacert => club/wpia}/gigi/email/TestEmailProvider.java (99%) rename util-testing/{org/cacert => club/wpia}/gigi/localisation/FileIterable.java (97%) rename util-testing/{org/cacert => club/wpia}/gigi/localisation/TaintSource.java (99%) rename util-testing/{org/cacert => club/wpia}/gigi/localisation/TranslationCollectingVisitor.java (98%) rename util-testing/{org/cacert => club/wpia}/gigi/localisation/TranslationCollector.java (97%) create mode 100644 util-testing/club/wpia/gigi/localisation/conf.txt rename util-testing/{org/cacert => club/wpia}/gigi/pages/Manager.java (92%) rename util-testing/{org/cacert => club/wpia}/gigi/pages/Manager.templ (100%) rename util-testing/{org/cacert => club/wpia}/gigi/pages/ManagerMails.templ (100%) rename util-testing/{org/cacert => club/wpia}/gigi/util/IOUtils.java (98%) rename util-testing/{org/cacert => club/wpia}/gigi/util/SimpleSigner.java (97%) delete mode 100644 util-testing/org/cacert/gigi/localisation/conf.txt rename util/{org/cacert => club/wpia}/gigi/util/DatabaseManager.java (93%) rename util/{org/cacert => club/wpia}/gigi/util/FetchLocales.java (99%) rename util/{org/cacert => club/wpia}/gigi/util/HighFinancialValueFetcher.java (98%) rename util/{org/cacert => club/wpia}/gigi/util/HighFinancialValueFetcherAlexa.java (94%) rename util/{org/cacert => club/wpia}/gigi/util/HighFinancialValueFetcherUmbrella.java (96%) diff --git a/.classpath b/.classpath index c1e59d8a..e9c35f2f 100644 --- a/.classpath +++ b/.classpath @@ -8,7 +8,7 @@ - + diff --git a/.gitignore b/.gitignore index 6ab3fcd4..193f64c7 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,7 @@ /work static.tar.gz -/src/org/cacert/gigi/util/effective_tld_names.dat +/src/club/wpia/gigi/util/effective_tld_names.dat /Gigi.MF #testing /testKeypair diff --git a/build.xml b/build.xml index eb6f4320..c42ec1fc 100644 --- a/build.xml +++ b/build.xml @@ -1,12 +1,12 @@ - + - + @@ -17,12 +17,12 @@ - + - + @@ -30,7 +30,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -99,13 +99,13 @@ - + - + @@ -113,8 +113,8 @@ includeantruntime="false" source="${source}" target="${target}"> - - + + @@ -122,16 +122,16 @@ includeantruntime="false" source="${source}" target="${target}"> - - - + + + - - + + - - + + @@ -152,7 +152,7 @@ + includes="gigi.jar,native/*.so,src/club/wpia/gigi/database/tableStructure.sql,static/**,templates/**" /> @@ -163,7 +163,7 @@ + includes="../src/club/wpia/gigi/database/tableStructure.sql,**,templates/**" /> @@ -174,7 +174,7 @@ + includes="../src/club/wpia/gigi/database/tableStructure.sql,**,templates/**" /> @@ -187,10 +187,10 @@ includeantruntime="false" source="${source}" target="${target}"> - + - - + + @@ -198,9 +198,9 @@ - - + @@ -215,9 +215,9 @@ - + - + @@ -239,7 +239,7 @@ - + @@ -261,28 +261,28 @@ - + - + - + - + - + @@ -297,20 +297,20 @@ - - + + - + - - + + - - + + @@ -322,36 +322,36 @@ - + - + - + - - + + - - + + - + - + - - + + diff --git a/config/gigi.properties.template b/config/gigi.properties.template index 4d7d8fda..3b056e1c 100644 --- a/config/gigi.properties.template +++ b/config/gigi.properties.template @@ -1,13 +1,13 @@ host=127.0.0.1 -name.static=static.cacert.local -name.secure=secure.cacert.local -name.www=www.cacert.local -name.api=api.cacert.local +name.static=static.wpia.local +name.secure=secure.wpia.local +name.www=www.wpia.local +name.api=api.wpia.local https.port=443 http.port=80 -#emailProvider=org.cacert.gigi.email.Sendmail -emailProvider=org.cacert.gigi.email.CommandlineEmailProvider +#emailProvider=club.wpia.gigi.email.Sendmail +emailProvider=club.wpia.gigi.email.CommandlineEmailProvider sql.driver=org.postgresql.Driver #sql.driver=com.mysql.jdbc.Driver sql.url=jdbc:postgresql://localhost/cacert diff --git a/debian/.gitignore b/debian/.gitignore index 5a7dbaa5..ab65d380 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,6 +1,6 @@ *.debhelper *.substvars *.log -cacert-gigi-setuid +wpia-gigi-setuid files -cacert-gigi +wpia-gigi diff --git a/debian/changelog b/debian/changelog index cc57cffe..198cd0bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -cacert-gigi (0.1) unstable; urgency=low +wpia-gigi (0.1) unstable; urgency=low * Initial Release - -- CAcert Software Team Thu, 25 Sep 2014 03:19:20 +0200 + -- WPIA Software Team Thu, 25 Sep 2014 03:19:20 +0200 diff --git a/debian/control b/debian/control index 8f932faa..7a52f97e 100644 --- a/debian/control +++ b/debian/control @@ -1,29 +1,29 @@ -Source: cacert-gigi +Source: wpia-gigi Section: java Priority: optional -Maintainer: unknown +Maintainer: unknown Build-Depends: debhelper (>= 8.0.0), dh-systemd, java7-sdk-headless Standards-Version: 3.9.4 -Homepage: http://cacert.org -#Vcs-Git: git://git.debian.org/collab-maint/cacert-gigi.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/cacert-gigi.git;a=summary +Homepage: https://wpia.club +#Vcs-Git: git://git.debian.org/collab-maint/gigi.git +#Vcs-Browser: http://git.debian.org/?p=collab-maint/gigi.git;a=summary -Package: cacert-gigi +Package: wpia-gigi Architecture: all -Depends: java7-runtime-headless, cacert-gigi-setuid, libpostgresql-jdbc-java, ${shlibs:Depends}, ${misc:Depends} -Conflicts: cacert-gigi-testing -Description: CAcert Web-DB software. +Depends: java7-runtime-headless, wpia-gigi-setuid, libpostgresql-jdbc-java, ${shlibs:Depends}, ${misc:Depends} +Conflicts: wpia-gigi-testing +Description: WPIA Web-DB software. This program is used to manage accounts and certificates. -Package: cacert-gigi-testing +Package: wpia-gigi-testing Architecture: all -Depends: java7-runtime-headless, cacert-gigi-setuid, libpostgresql-jdbc-java, ${shlibs:Depends}, ${misc:Depends} -Conflicts: cacert-gigi -Description: CAcert Web-DB software testing version. +Depends: java7-runtime-headless, wpia-gigi-setuid, libpostgresql-jdbc-java, ${shlibs:Depends}, ${misc:Depends} +Conflicts: wpia-gigi +Description: WPIA Web-DB software testing version. This program is the release to the testing server. -Package: cacert-gigi-setuid +Package: wpia-gigi-setuid Architecture: any Depends: java7-runtime-headless, ${shlibs:Depends}, ${misc:Depends} -Description: CAcert Web-DB software's setuid native library. +Description: WPIA Web-DB software's setuid native library. It is used to drop privilleges after allocating ports. diff --git a/debian/copyright b/debian/copyright index c4549482..3c841acf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,29 +1,29 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: gigi -Source: +Source: Files: * -Copyright: 2014 CAcert Software Team +Copyright: 2014 WPIA Software Team License: GPL-2.0 Files: debian/* -Copyright: 2014 CAcert Software Team +Copyright: 2014 WPIA Software Team License: GPL-2.0 -Files: src/org/cacert/gigi/output/template -Copyright: 2015 CAcert Software Team +Files: src/club/wpia/gigi/output/template +Copyright: 2015 WPIA Software Team License: GPL-2.0 or BSD -Files: src/org/cacert/gigi/localisation -Copyright: 2015 CAcert Software Team +Files: src/club/wpia/gigi/localisation +Copyright: 2015 WPIA Software Team License: GPL-2.0 or BSD -Files: src/org/cacert/gigi/database -Copyright: 2015 CAcert Software Team +Files: src/club/wpia/gigi/database +Copyright: 2015 WPIA Software Team License: GPL-2.0 or BSD License: BSD - Copyright (c) 2015, CAcert + Copyright (c) 2015, WPIA All rights reserved. . Redistribution and use in source and binary forms, with or without diff --git a/debian/gigi-proxy.service b/debian/gigi-proxy.service index 52eddbd7..df5d9894 100644 --- a/debian/gigi-proxy.service +++ b/debian/gigi-proxy.service @@ -6,11 +6,11 @@ Conflicts=gigi-standalone.service PartOf=gigi-proxy.socket [Service] -ExecStart=/usr/bin/java -cp /usr/share/java/postgresql-jdbc4.jar:/usr/share/java/gigi.jar org.cacert.gigi.Launcher /etc/cacert/gigi/conf.tar +ExecStart=/usr/bin/java -cp /usr/share/java/postgresql-jdbc4.jar:/usr/share/java/gigi.jar club.wpia.gigi.Launcher /etc/wpia/gigi/conf.tar StandardInput=socket StandardOutput=journal StandardError=journal -WorkingDirectory=/var/lib/cacert-gigi +WorkingDirectory=/var/lib/wpia-gigi User=gigi PrivateTmp=yes PrivateDevices=yes diff --git a/debian/gigi-simple-signer.service b/debian/gigi-simple-signer.service index fe0a7f49..70768b42 100644 --- a/debian/gigi-simple-signer.service +++ b/debian/gigi-simple-signer.service @@ -2,8 +2,8 @@ Description=Gigi simple signer for ET [Service] -ExecStart=/usr/bin/java -cp /usr/share/java/postgresql-jdbc4.jar:/usr/share/java/gigi.jar org.cacert.gigi.util.SimpleSigner -WorkingDirectory=/var/lib/cacert-gigi +ExecStart=/usr/bin/java -cp /usr/share/java/postgresql-jdbc4.jar:/usr/share/java/gigi.jar club.wpia.gigi.util.SimpleSigner +WorkingDirectory=/var/lib/wpia-gigi User=gigi PrivateTmp=yes PrivateDevices=yes diff --git a/debian/gigi-standalone.service b/debian/gigi-standalone.service index 776625f8..9fe1dcf5 100644 --- a/debian/gigi-standalone.service +++ b/debian/gigi-standalone.service @@ -5,9 +5,9 @@ After=postgresql@9.4-main.service Conflicts=gigi-proxy.service [Service] -ExecStart=/usr/bin/java -cp /usr/share/java/postgresql-jdbc4.jar:/usr/share/java/gigi.jar org.cacert.gigi.Launcher /etc/cacert/gigi/conf.tar +ExecStart=/usr/bin/java -cp /usr/share/java/postgresql-jdbc4.jar:/usr/share/java/gigi.jar club.wpia.gigi.Launcher /etc/wpia/gigi/conf.tar CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_SETUID CAP_SETGID -WorkingDirectory=/var/lib/cacert-gigi +WorkingDirectory=/var/lib/wpia-gigi PrivateTmp=yes PrivateDevices=yes ProtectSystem=full diff --git a/debian/gigi.1 b/debian/gigi.1 index 61b41b69..d7eaa369 100644 --- a/debian/gigi.1 +++ b/debian/gigi.1 @@ -1,7 +1,7 @@ .\" Hey, EMACS: -*- nroff -*- -.\" (C) Copyright 2014 CAcert Software Team , +.\" (C) Copyright 2014-2017 WPIA Software Team , .\" -.TH CACERT-GIGI 1 "September 25, 2014" +.TH WPIA-GIGI 1 "September 25, 2014" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -15,13 +15,13 @@ .\" .sp insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -cacert-gigi \- a starter for the CAcert-gigi system +gigi \- a starter for the WPIA-gigi system .SH SYNOPSIS -.B cacert-gigi +.B gigi .RI {start|signer|reset-database|fetch-locales} .SH DESCRIPTION -.B cacert-gigi -is the starter for the CAcert-gigi system. +.B gigi +is the starter for the WPIA-gigi system. .\" TeX users may be more comfortable with the \fB\fP and .\" \fI\fP escape sequences to invode bold face and italics, .\" respectively. @@ -31,7 +31,7 @@ is the starter for the CAcert-gigi system. Run the usual webdb (not forking) with opening jdwp on port 8000. You will need to pipe the config into this program. .TP .B fetch-locales -Fetch all Translations from http://translations.cacert.org/ +Fetch all Translations .TP .B reset-database Delete the whole database contents, resetting it to default. @@ -46,4 +46,4 @@ Configure the (internal) signer and the "reset-database"-tool with the config fr Run the usual webdb (not forking). You will need to pipe the config into this program. .TP .B start-daemon -Run the usual webdb (forking). You will not need to pipe the config into this program. It reads the config from /etc/cacert/gigi/conf.tar +Run the usual webdb (forking). You will not need to pipe the config into this program. It reads the config from /etc/wpia/gigi/conf.tar diff --git a/debian/rules b/debian/rules index c384f79f..1491fd40 100755 --- a/debian/rules +++ b/debian/rules @@ -14,13 +14,13 @@ override_dh_auto_clean: echo i dont clean override_dh_installinit: - dh_installinit --name=cacert-gigi - dh_installinit --name=cacert-gigi-signer + dh_installinit --name=wpia-gigi + dh_installinit --name=wpia-gigi-signer override_dh_auto_build: build override_dh_auto_install: - DESTDIR=debian/cacert-gigi ant install - DESTDIR=debian/cacert-gigi-testing ant install-testing - DESTDIR=debian/cacert-gigi-setuid ant install-native + DESTDIR=debian/wpia-gigi ant install + DESTDIR=debian/wpia-gigi-testing ant install-testing + DESTDIR=debian/wpia-gigi-setuid ant install-native diff --git a/debian/cacert-gigi-testing.docs b/debian/wpia-gigi-testing.docs similarity index 100% rename from debian/cacert-gigi-testing.docs rename to debian/wpia-gigi-testing.docs diff --git a/debian/cacert-gigi-testing.gigi-simple-signer.init b/debian/wpia-gigi-testing.gigi-simple-signer.init similarity index 100% rename from debian/cacert-gigi-testing.gigi-simple-signer.init rename to debian/wpia-gigi-testing.gigi-simple-signer.init diff --git a/debian/cacert-gigi-testing.gigi-standalone.init b/debian/wpia-gigi-testing.gigi-standalone.init similarity index 100% rename from debian/cacert-gigi-testing.gigi-standalone.init rename to debian/wpia-gigi-testing.gigi-standalone.init diff --git a/debian/cacert-gigi-testing.install b/debian/wpia-gigi-testing.install similarity index 100% rename from debian/cacert-gigi-testing.install rename to debian/wpia-gigi-testing.install diff --git a/debian/cacert-gigi-testing.manpages b/debian/wpia-gigi-testing.manpages similarity index 100% rename from debian/cacert-gigi-testing.manpages rename to debian/wpia-gigi-testing.manpages diff --git a/debian/cacert-gigi-testing.postinst b/debian/wpia-gigi-testing.postinst similarity index 93% rename from debian/cacert-gigi-testing.postinst rename to debian/wpia-gigi-testing.postinst index e5654e36..f351f036 100644 --- a/debian/cacert-gigi-testing.postinst +++ b/debian/wpia-gigi-testing.postinst @@ -1,5 +1,5 @@ #!/bin/sh -# postinst script for cacert-gigi +# postinst script for wpia-gigi # # see: dh_installdeb(1) @@ -22,7 +22,7 @@ case "$1" in configure) if [ -f /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule - db_get cacert-gigi-testing/fetch-locales-command + db_get wpia-gigi-testing/fetch-locales-command $RET else gigi fetch-locales diff --git a/debian/cacert-gigi-testing.templates b/debian/wpia-gigi-testing.templates similarity index 69% rename from debian/cacert-gigi-testing.templates rename to debian/wpia-gigi-testing.templates index ddf85d06..2822c59b 100644 --- a/debian/cacert-gigi-testing.templates +++ b/debian/wpia-gigi-testing.templates @@ -1,4 +1,4 @@ -Template: cacert-gigi-testing/fetch-locales-command +Template: wpia-gigi-testing/fetch-locales-command Type: string Default: gigi fetch-locales Description: The command to fetch locales with after installation is complete diff --git a/debian/cacert-gigi-testing.cacert-gigi-signer.default b/debian/wpia-gigi-testing.wpia-gigi-signer.default similarity index 100% rename from debian/cacert-gigi-testing.cacert-gigi-signer.default rename to debian/wpia-gigi-testing.wpia-gigi-signer.default diff --git a/debian/cacert-gigi-testing.cacert-gigi.default b/debian/wpia-gigi-testing.wpia-gigi.default similarity index 100% rename from debian/cacert-gigi-testing.cacert-gigi.default rename to debian/wpia-gigi-testing.wpia-gigi.default diff --git a/debian/cacert-gigi.docs b/debian/wpia-gigi.docs similarity index 100% rename from debian/cacert-gigi.docs rename to debian/wpia-gigi.docs diff --git a/debian/cacert-gigi.gigi-simple-signer.init b/debian/wpia-gigi.gigi-simple-signer.init similarity index 100% rename from debian/cacert-gigi.gigi-simple-signer.init rename to debian/wpia-gigi.gigi-simple-signer.init diff --git a/debian/cacert-gigi.gigi-standalone.init b/debian/wpia-gigi.gigi-standalone.init similarity index 100% rename from debian/cacert-gigi.gigi-standalone.init rename to debian/wpia-gigi.gigi-standalone.init diff --git a/debian/cacert-gigi.install b/debian/wpia-gigi.install similarity index 100% rename from debian/cacert-gigi.install rename to debian/wpia-gigi.install diff --git a/debian/cacert-gigi.manpages b/debian/wpia-gigi.manpages similarity index 100% rename from debian/cacert-gigi.manpages rename to debian/wpia-gigi.manpages diff --git a/debian/cacert-gigi.postinst b/debian/wpia-gigi.postinst similarity index 93% rename from debian/cacert-gigi.postinst rename to debian/wpia-gigi.postinst index 519ecc48..af5a8de9 100644 --- a/debian/cacert-gigi.postinst +++ b/debian/wpia-gigi.postinst @@ -1,5 +1,5 @@ #!/bin/sh -# postinst script for cacert-gigi +# postinst script for wpia-gigi # # see: dh_installdeb(1) @@ -22,7 +22,7 @@ case "$1" in configure) if [ -f /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule - db_get cacert-gigi/fetch-locales-command + db_get wpia-gigi/fetch-locales-command $RET else gigi fetch-locales diff --git a/debian/cacert-gigi.templates b/debian/wpia-gigi.templates similarity index 73% rename from debian/cacert-gigi.templates rename to debian/wpia-gigi.templates index e47d9cc4..15f2582c 100644 --- a/debian/cacert-gigi.templates +++ b/debian/wpia-gigi.templates @@ -1,4 +1,4 @@ -Template: cacert-gigi/fetch-locales-command +Template: wpia-gigi/fetch-locales-command Type: string Default: gigi fetch-locales Description: The command to fetch locales with after installation is complete diff --git a/doc/beforeYouStart.txt b/doc/beforeYouStart.txt index 809d70e7..8446f058 100644 --- a/doc/beforeYouStart.txt +++ b/doc/beforeYouStart.txt @@ -1,11 +1,11 @@ Before you start using you might want to: -- use cacert-nre to generate a roots structure +- use wpia-nre to generate a roots structure - extract the gigi-*.tar.gz file into "config" - execute "generateTruststore.sh" there - extract the signer-server-*.tar.gz into "signer" -- download locales (util/ org.cacert.gigi.util.FetchLocales) +- download locales (util/ club.wpia.gigi.util.FetchLocales) - write your sql connection properties: config/gigi.properties.template -> config/gigi.properties - install "hosts" entries for the hosts you entered in "gigi.properties" (be aware if you change the default ones you need to change the CN given in the certificates) diff --git a/doc/scripts/gigi b/doc/scripts/gigi index 0a4ee3d8..ba3677e0 100755 --- a/doc/scripts/gigi +++ b/doc/scripts/gigi @@ -1,6 +1,6 @@ #!/bin/sh -: ${GIGI_CONF_DIR:=/etc/cacert/gigi} +: ${GIGI_CONF_DIR:=/etc/wpia/gigi} [ -r "$GIGI_CONF_DIR/launcher.conf" ] && . "$GIGI_CONF_DIR/launcher.conf" @@ -8,7 +8,7 @@ : \ ${JDBC_DRIVER:=/usr/share/java/postgresql-jdbc4.jar} \ ${GIGI_EXEC:=/usr/share/java/gigi.jar} \ - ${GIGI_DATA_DIR:=/var/lib/cacert-gigi} + ${GIGI_DATA_DIR:=/var/lib/wpia-gigi} die() { if [ $# -ge 1 ]; then @@ -26,7 +26,7 @@ runGigiClass() { java_opts="$1" shift fi - exec java $java_opts -cp "$JDBC_DRIVER:$GIGI_EXEC" org.cacert.gigi.$class "$@" + exec java $java_opts -cp "$JDBC_DRIVER:$GIGI_EXEC" club.wpia.gigi.$class "$@" } command="$1" @@ -36,9 +36,9 @@ case "$command" in debug) runGigiClass Launcher "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000" ;; start-daemon) exec 3>/var/log/cacert-gigi.log || die 'open log' + exec 4>>/var/log/wpia-gigi.log || die 'open log' runGigiClass Launcher <&3 >&4 2>&1 & - echo $! > /var/run/cacert-gigi.pid + echo $! > /var/run/wpia-gigi.pid ;; signer) runGigiClass util.SimpleSigner ;; reset-database) runGigiClass util.DatabaseManager ;; diff --git a/natives/Makefile b/natives/Makefile index 4fa62a79..cc72469b 100644 --- a/natives/Makefile +++ b/natives/Makefile @@ -9,10 +9,10 @@ LDFLAGS=-shared all: libsetuid.so -org_cacert_gigi_natives_SetUID.h: ../src/org/cacert/gigi/natives/SetUID.java - $(JAVAH) -classpath ../bin/ -jni org.cacert.gigi.natives.SetUID +club_wpia_gigi_natives_SetUID.h: ../src/club/wpia/gigi/natives/SetUID.java + $(JAVAH) -classpath ../bin/ -jni club.wpia.gigi.natives.SetUID -libsetuid.so: org_cacert_gigi_natives_SetUID.c org_cacert_gigi_natives_SetUID.h +libsetuid.so: club_wpia_gigi_natives_SetUID.c club_wpia_gigi_natives_SetUID.h $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< clean: diff --git a/natives/org_cacert_gigi_natives_SetUID.c b/natives/club_wpia_gigi_natives_SetUID.c similarity index 87% rename from natives/org_cacert_gigi_natives_SetUID.c rename to natives/club_wpia_gigi_natives_SetUID.c index 1b2350b4..c0034677 100644 --- a/natives/org_cacert_gigi_natives_SetUID.c +++ b/natives/club_wpia_gigi_natives_SetUID.c @@ -3,8 +3,8 @@ #include -#ifndef _Included_org_cacert_natives_SetUID -#define _Included_org_cacert_natives_SetUID +#ifndef _Included_club_wpia_natives_SetUID +#define _Included_club_wpia_natives_SetUID #ifdef __cplusplus extern "C" { #endif @@ -12,12 +12,12 @@ extern "C" { static jobject getStatus(JNIEnv *env, int successCode, const char * message) { jstring message_str = (*env)->NewStringUTF(env, message); jboolean success = successCode; - jclass cls = (*env)->FindClass(env, "Lorg/cacert/gigi/natives/SetUID$Status;"); + jclass cls = (*env)->FindClass(env, "Lclub/wpia/gigi/natives/SetUID$Status;"); jmethodID constructor = (*env)->GetMethodID(env, cls, "", "(ZLjava/lang/String;)V"); return (*env)->NewObject(env, cls, constructor, success, message_str); } -JNIEXPORT jobject JNICALL Java_org_cacert_gigi_natives_SetUID_setUid +JNIEXPORT jobject JNICALL Java_club_wpia_gigi_natives_SetUID_setUid (JNIEnv *env, jobject obj, jint uid_, jint gid_) { /* We don't need the reference for the object/class we are working on */ diff --git a/src/org/cacert/gigi/Gigi.java b/src/club/wpia/gigi/Gigi.java similarity index 84% rename from src/org/cacert/gigi/Gigi.java rename to src/club/wpia/gigi/Gigi.java index c7a60794..f8f931a6 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/club/wpia/gigi/Gigi.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import java.io.IOException; import java.io.PrintWriter; @@ -20,64 +20,64 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.cacert.gigi.database.DatabaseConnection; -import org.cacert.gigi.database.DatabaseConnection.Link; -import org.cacert.gigi.dbObjects.CACertificate; -import org.cacert.gigi.dbObjects.CATS.CATSType; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.DomainPingConfiguration; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.Menu; -import org.cacert.gigi.output.MenuCollector; -import org.cacert.gigi.output.PageMenuItem; -import org.cacert.gigi.output.SimpleMenuItem; -import org.cacert.gigi.output.SimpleUntranslatedMenuItem; -import org.cacert.gigi.output.template.Form.CSRFException; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.AboutPage; -import org.cacert.gigi.pages.HandlesMixedRequest; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.LogoutPage; -import org.cacert.gigi.pages.MainPage; -import org.cacert.gigi.pages.OneFormPage; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.pages.PasswordResetPage; -import org.cacert.gigi.pages.RootCertPage; -import org.cacert.gigi.pages.StaticPage; -import org.cacert.gigi.pages.TestSecure; -import org.cacert.gigi.pages.Verify; -import org.cacert.gigi.pages.account.ChangePasswordPage; -import org.cacert.gigi.pages.account.FindAgentAccess; -import org.cacert.gigi.pages.account.History; -import org.cacert.gigi.pages.account.MyDetails; -import org.cacert.gigi.pages.account.UserTrainings; -import org.cacert.gigi.pages.account.certs.CertificateAdd; -import org.cacert.gigi.pages.account.certs.Certificates; -import org.cacert.gigi.pages.account.domain.DomainOverview; -import org.cacert.gigi.pages.account.domain.EditDomain; -import org.cacert.gigi.pages.account.mail.MailOverview; -import org.cacert.gigi.pages.admin.TTPAdminPage; -import org.cacert.gigi.pages.admin.support.FindCertPage; -import org.cacert.gigi.pages.admin.support.FindUserByDomainPage; -import org.cacert.gigi.pages.admin.support.FindUserByEmailPage; -import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage; -import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage; -import org.cacert.gigi.pages.error.AccessDenied; -import org.cacert.gigi.pages.error.PageNotFound; -import org.cacert.gigi.pages.main.RegisterPage; -import org.cacert.gigi.pages.orga.CreateOrgPage; -import org.cacert.gigi.pages.orga.ViewOrgPage; -import org.cacert.gigi.pages.statistics.StatisticsRoles; -import org.cacert.gigi.pages.wot.AssurePage; -import org.cacert.gigi.pages.wot.Points; -import org.cacert.gigi.pages.wot.RequestTTPPage; -import org.cacert.gigi.ping.PingerDaemon; -import org.cacert.gigi.util.AuthorizationContext; -import org.cacert.gigi.util.DomainAssessment; -import org.cacert.gigi.util.PasswordHash; -import org.cacert.gigi.util.ServerConstants; -import org.cacert.gigi.util.TimeConditions; +import club.wpia.gigi.database.DatabaseConnection; +import club.wpia.gigi.database.DatabaseConnection.Link; +import club.wpia.gigi.dbObjects.CACertificate; +import club.wpia.gigi.dbObjects.CATS.CATSType; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.DomainPingConfiguration; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.Menu; +import club.wpia.gigi.output.MenuCollector; +import club.wpia.gigi.output.PageMenuItem; +import club.wpia.gigi.output.SimpleMenuItem; +import club.wpia.gigi.output.SimpleUntranslatedMenuItem; +import club.wpia.gigi.output.template.Form.CSRFException; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.AboutPage; +import club.wpia.gigi.pages.HandlesMixedRequest; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.LogoutPage; +import club.wpia.gigi.pages.MainPage; +import club.wpia.gigi.pages.OneFormPage; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.pages.PasswordResetPage; +import club.wpia.gigi.pages.RootCertPage; +import club.wpia.gigi.pages.StaticPage; +import club.wpia.gigi.pages.TestSecure; +import club.wpia.gigi.pages.Verify; +import club.wpia.gigi.pages.account.ChangePasswordPage; +import club.wpia.gigi.pages.account.FindAgentAccess; +import club.wpia.gigi.pages.account.History; +import club.wpia.gigi.pages.account.MyDetails; +import club.wpia.gigi.pages.account.UserTrainings; +import club.wpia.gigi.pages.account.certs.CertificateAdd; +import club.wpia.gigi.pages.account.certs.Certificates; +import club.wpia.gigi.pages.account.domain.DomainOverview; +import club.wpia.gigi.pages.account.domain.EditDomain; +import club.wpia.gigi.pages.account.mail.MailOverview; +import club.wpia.gigi.pages.admin.TTPAdminPage; +import club.wpia.gigi.pages.admin.support.FindCertPage; +import club.wpia.gigi.pages.admin.support.FindUserByDomainPage; +import club.wpia.gigi.pages.admin.support.FindUserByEmailPage; +import club.wpia.gigi.pages.admin.support.SupportEnterTicketPage; +import club.wpia.gigi.pages.admin.support.SupportUserDetailsPage; +import club.wpia.gigi.pages.error.AccessDenied; +import club.wpia.gigi.pages.error.PageNotFound; +import club.wpia.gigi.pages.main.RegisterPage; +import club.wpia.gigi.pages.orga.CreateOrgPage; +import club.wpia.gigi.pages.orga.ViewOrgPage; +import club.wpia.gigi.pages.statistics.StatisticsRoles; +import club.wpia.gigi.pages.wot.AssurePage; +import club.wpia.gigi.pages.wot.Points; +import club.wpia.gigi.pages.wot.RequestTTPPage; +import club.wpia.gigi.ping.PingerDaemon; +import club.wpia.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.DomainAssessment; +import club.wpia.gigi.util.PasswordHash; +import club.wpia.gigi.util.ServerConstants; +import club.wpia.gigi.util.TimeConditions; public final class Gigi extends HttpServlet { @@ -177,7 +177,7 @@ public final class Gigi extends HttpServlet { if (testing) { try { - Class manager = Class.forName("org.cacert.gigi.pages.Manager"); + Class manager = Class.forName("club.wpia.gigi.pages.Manager"); Page p = (Page) manager.getMethod("getInstance").invoke(null); String pa = (String) manager.getField("PATH").get(null); putPage(pa + "/*", p, "Gigi test server"); @@ -218,19 +218,19 @@ public final class Gigi extends HttpServlet { public static final String LOGGEDIN = "loggedin"; - public static final String CERT_SERIAL = "org.cacert.gigi.serial"; + public static final String CERT_SERIAL = "club.wpia.gigi.serial"; - public static final String CERT_ISSUER = "org.cacert.gigi.issuer"; + public static final String CERT_ISSUER = "club.wpia.gigi.issuer"; public static final String AUTH_CONTEXT = "auth"; - public static final String LOGIN_METHOD = "org.cacert.gigi.loginMethod"; + public static final String LOGIN_METHOD = "club.wpia.gigi.loginMethod"; private static final long serialVersionUID = -6386785421902852904L; private static Gigi instance; - private static final Template baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));; + private static final Template baseTemplate = new Template(Gigi.class.getResource("Gigi.templ")); private PingerDaemon pinger; @@ -463,7 +463,7 @@ public final class Gigi extends HttpServlet { csp.append(";script-src https://" + ServerConstants.getStaticHostNamePortSecure()); csp.append(";style-src https://" + ServerConstants.getStaticHostNamePortSecure()); csp.append(";form-action https://" + ServerConstants.getSecureHostNamePortSecure() + " https://" + ServerConstants.getWwwHostNamePortSecure()); - // csp.append(";report-url https://api.cacert.org/security/csp/report"); + // csp.append(";report-url https://api.wpia.club/security/csp/report"); return csp.toString(); } @@ -476,7 +476,7 @@ public final class Gigi extends HttpServlet { csp.append(";script-src http://" + ServerConstants.getStaticHostNamePort()); csp.append(";style-src http://" + ServerConstants.getStaticHostNamePort()); csp.append(";form-action https://" + ServerConstants.getSecureHostNamePortSecure() + " https://" + ServerConstants.getWwwHostNamePort()); - // csp.append(";report-url http://api.cacert.org/security/csp/report"); + // csp.append(";report-url http://api.wpia.club/security/csp/report"); return csp.toString(); } diff --git a/src/org/cacert/gigi/Gigi.templ b/src/club/wpia/gigi/Gigi.templ similarity index 100% rename from src/org/cacert/gigi/Gigi.templ rename to src/club/wpia/gigi/Gigi.templ diff --git a/src/org/cacert/gigi/GigiApiException.java b/src/club/wpia/gigi/GigiApiException.java similarity index 94% rename from src/org/cacert/gigi/GigiApiException.java rename to src/club/wpia/gigi/GigiApiException.java index 7b3a9909..0e1a1b7f 100644 --- a/src/org/cacert/gigi/GigiApiException.java +++ b/src/club/wpia/gigi/GigiApiException.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import java.io.PrintWriter; import java.io.StringWriter; @@ -7,9 +7,9 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.Locale; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.TranslateCommand; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.TranslateCommand; public class GigiApiException extends Exception { diff --git a/src/org/cacert/gigi/GigiConfig.java b/src/club/wpia/gigi/GigiConfig.java similarity index 99% rename from src/org/cacert/gigi/GigiConfig.java rename to src/club/wpia/gigi/GigiConfig.java index 8b7c2202..56f46cab 100644 --- a/src/org/cacert/gigi/GigiConfig.java +++ b/src/club/wpia/gigi/GigiConfig.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/org/cacert/gigi/Launcher.java b/src/club/wpia/gigi/Launcher.java similarity index 98% rename from src/org/cacert/gigi/Launcher.java rename to src/club/wpia/gigi/Launcher.java index 7c588d8e..a1cd2693 100644 --- a/src/org/cacert/gigi/Launcher.java +++ b/src/club/wpia/gigi/Launcher.java @@ -1,10 +1,10 @@ -package org.cacert.gigi; +package club.wpia.gigi; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.net.HttpURLConnection; import java.net.InetSocketAddress; import java.security.GeneralSecurityException; @@ -30,12 +30,6 @@ import javax.net.ssl.SSLParameters; import javax.net.ssl.SSLSession; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.api.GigiAPI; -import org.cacert.gigi.email.EmailProvider; -import org.cacert.gigi.natives.SetUID; -import org.cacert.gigi.util.CipherInfo; -import org.cacert.gigi.util.PEM; -import org.cacert.gigi.util.ServerConstants; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpVersion; @@ -61,6 +55,13 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.ssl.SslContextFactory; +import club.wpia.gigi.api.GigiAPI; +import club.wpia.gigi.email.EmailProvider; +import club.wpia.gigi.natives.SetUID; +import club.wpia.gigi.util.CipherInfo; +import club.wpia.gigi.util.PEM; +import club.wpia.gigi.util.ServerConstants; + public class Launcher { class ExtendedForwarded implements Customizer { diff --git a/src/org/cacert/gigi/PermissionCheckable.java b/src/club/wpia/gigi/PermissionCheckable.java similarity index 57% rename from src/org/cacert/gigi/PermissionCheckable.java rename to src/club/wpia/gigi/PermissionCheckable.java index 4b868f2a..ccdcb368 100644 --- a/src/org/cacert/gigi/PermissionCheckable.java +++ b/src/club/wpia/gigi/PermissionCheckable.java @@ -1,6 +1,6 @@ -package org.cacert.gigi; +package club.wpia.gigi; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.AuthorizationContext; public interface PermissionCheckable { diff --git a/src/org/cacert/gigi/PolicyRedirector.java b/src/club/wpia/gigi/PolicyRedirector.java similarity index 97% rename from src/org/cacert/gigi/PolicyRedirector.java rename to src/club/wpia/gigi/PolicyRedirector.java index e907c376..9326f4f2 100644 --- a/src/org/cacert/gigi/PolicyRedirector.java +++ b/src/club/wpia/gigi/PolicyRedirector.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import java.io.IOException; diff --git a/src/org/cacert/gigi/api/APIPoint.java b/src/club/wpia/gigi/api/APIPoint.java similarity index 91% rename from src/org/cacert/gigi/api/APIPoint.java rename to src/club/wpia/gigi/api/APIPoint.java index 72a555b1..737426a7 100644 --- a/src/org/cacert/gigi/api/APIPoint.java +++ b/src/club/wpia/gigi/api/APIPoint.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import java.io.IOException; import java.security.cert.X509Certificate; @@ -6,10 +6,10 @@ import java.security.cert.X509Certificate; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.LoginPage; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.LoginPage; public abstract class APIPoint { diff --git a/src/org/cacert/gigi/api/CATSImport.java b/src/club/wpia/gigi/api/CATSImport.java similarity index 91% rename from src/org/cacert/gigi/api/CATSImport.java rename to src/club/wpia/gigi/api/CATSImport.java index afa0f2a6..9bb39abc 100644 --- a/src/org/cacert/gigi/api/CATSImport.java +++ b/src/club/wpia/gigi/api/CATSImport.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import java.io.IOException; import java.util.Date; @@ -6,9 +6,9 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.CATS; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.CATS; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.User; public class CATSImport extends CATSRestrictedApi { diff --git a/src/org/cacert/gigi/api/CATSResolve.java b/src/club/wpia/gigi/api/CATSResolve.java similarity index 85% rename from src/org/cacert/gigi/api/CATSResolve.java rename to src/club/wpia/gigi/api/CATSResolve.java index 6e7c83dd..f326fb4e 100644 --- a/src/org/cacert/gigi/api/CATSResolve.java +++ b/src/club/wpia/gigi/api/CATSResolve.java @@ -1,15 +1,15 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.util.ServerConstants; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.util.ServerConstants; public class CATSResolve extends CATSRestrictedApi { diff --git a/src/org/cacert/gigi/api/CATSRestrictedApi.java b/src/club/wpia/gigi/api/CATSRestrictedApi.java similarity index 78% rename from src/org/cacert/gigi/api/CATSRestrictedApi.java rename to src/club/wpia/gigi/api/CATSRestrictedApi.java index b7ff83a9..971884cb 100644 --- a/src/org/cacert/gigi/api/CATSRestrictedApi.java +++ b/src/club/wpia/gigi/api/CATSRestrictedApi.java @@ -1,16 +1,16 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.SANType; -import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.util.ServerConstants; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.Certificate.SANType; +import club.wpia.gigi.dbObjects.Certificate.SubjectAlternateName; +import club.wpia.gigi.util.ServerConstants; public abstract class CATSRestrictedApi extends APIPoint { diff --git a/src/org/cacert/gigi/api/CreateCertificate.java b/src/club/wpia/gigi/api/CreateCertificate.java similarity index 83% rename from src/org/cacert/gigi/api/CreateCertificate.java rename to src/club/wpia/gigi/api/CreateCertificate.java index a939b9e6..6af284c0 100644 --- a/src/org/cacert/gigi/api/CreateCertificate.java +++ b/src/club/wpia/gigi/api/CreateCertificate.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import java.io.IOException; import java.io.PrintWriter; @@ -7,16 +7,16 @@ import java.security.GeneralSecurityException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.Job; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.account.certs.CertificateRequest; -import org.cacert.gigi.util.AuthorizationContext; -import org.cacert.gigi.util.CertExporter; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.Job; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.pages.account.certs.CertificateRequest; +import club.wpia.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.CertExporter; public class CreateCertificate extends APIPoint { diff --git a/src/org/cacert/gigi/api/EmailReping.java b/src/club/wpia/gigi/api/EmailReping.java similarity index 85% rename from src/org/cacert/gigi/api/EmailReping.java rename to src/club/wpia/gigi/api/EmailReping.java index e2c3383f..7ae012b0 100644 --- a/src/org/cacert/gigi/api/EmailReping.java +++ b/src/club/wpia/gigi/api/EmailReping.java @@ -1,14 +1,14 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; public class EmailReping extends APIPoint { diff --git a/src/org/cacert/gigi/api/Emails.java b/src/club/wpia/gigi/api/Emails.java similarity index 91% rename from src/org/cacert/gigi/api/Emails.java rename to src/club/wpia/gigi/api/Emails.java index 6641a8e6..21983cc0 100644 --- a/src/org/cacert/gigi/api/Emails.java +++ b/src/club/wpia/gigi/api/Emails.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import java.io.IOException; import java.util.Date; @@ -6,11 +6,12 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.User; import org.json.JSONWriter; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.User; + public class Emails extends APIPoint { public static final String PATH = "/account/emails"; diff --git a/src/org/cacert/gigi/api/FindAgent.java b/src/club/wpia/gigi/api/FindAgent.java similarity index 91% rename from src/org/cacert/gigi/api/FindAgent.java rename to src/club/wpia/gigi/api/FindAgent.java index ba58a7a3..bb2a5782 100644 --- a/src/org/cacert/gigi/api/FindAgent.java +++ b/src/club/wpia/gigi/api/FindAgent.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import java.io.IOException; import java.io.PrintWriter; @@ -7,16 +7,17 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.email.EmailProvider; -import org.cacert.gigi.pages.account.FindAgentAccess; -import org.cacert.gigi.util.ServerConstants; import org.json.JSONWriter; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.email.EmailProvider; +import club.wpia.gigi.pages.account.FindAgentAccess; +import club.wpia.gigi.util.ServerConstants; + public class FindAgent extends APIPoint { public static final String PATH_RESOLVE = "/find-agent/resolve"; diff --git a/src/org/cacert/gigi/api/GigiAPI.java b/src/club/wpia/gigi/api/GigiAPI.java similarity index 93% rename from src/org/cacert/gigi/api/GigiAPI.java rename to src/club/wpia/gigi/api/GigiAPI.java index bd6884f9..1f99e510 100644 --- a/src/org/cacert/gigi/api/GigiAPI.java +++ b/src/club/wpia/gigi/api/GigiAPI.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import java.io.IOException; import java.io.InputStreamReader; @@ -10,8 +10,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.database.DatabaseConnection; -import org.cacert.gigi.database.DatabaseConnection.Link; +import club.wpia.gigi.database.DatabaseConnection; +import club.wpia.gigi.database.DatabaseConnection.Link; public class GigiAPI extends HttpServlet { diff --git a/src/org/cacert/gigi/api/RevokeCertificate.java b/src/club/wpia/gigi/api/RevokeCertificate.java similarity index 85% rename from src/org/cacert/gigi/api/RevokeCertificate.java rename to src/club/wpia/gigi/api/RevokeCertificate.java index 2f15511a..1b21e240 100644 --- a/src/org/cacert/gigi/api/RevokeCertificate.java +++ b/src/club/wpia/gigi/api/RevokeCertificate.java @@ -1,14 +1,14 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.dbObjects.Job; -import org.cacert.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.Job; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; public class RevokeCertificate extends APIPoint { diff --git a/src/org/cacert/gigi/crypto/SMIME.java b/src/club/wpia/gigi/crypto/SMIME.java similarity index 98% rename from src/org/cacert/gigi/crypto/SMIME.java rename to src/club/wpia/gigi/crypto/SMIME.java index de39f5a1..1bfbf08b 100644 --- a/src/org/cacert/gigi/crypto/SMIME.java +++ b/src/club/wpia/gigi/crypto/SMIME.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.crypto; +package club.wpia.gigi.crypto; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -10,8 +10,7 @@ import java.security.Signature; import java.security.cert.X509Certificate; import java.util.Random; -import org.cacert.gigi.util.PEM; - +import club.wpia.gigi.util.PEM; import sun.security.pkcs.ContentInfo; import sun.security.pkcs.PKCS7; import sun.security.pkcs.SignerInfo; diff --git a/src/org/cacert/gigi/crypto/SPKAC.java b/src/club/wpia/gigi/crypto/SPKAC.java similarity index 98% rename from src/org/cacert/gigi/crypto/SPKAC.java rename to src/club/wpia/gigi/crypto/SPKAC.java index c97f5acf..77c7e2c0 100644 --- a/src/org/cacert/gigi/crypto/SPKAC.java +++ b/src/club/wpia/gigi/crypto/SPKAC.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.crypto; +package club.wpia.gigi.crypto; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/src/org/cacert/gigi/database/DBEnum.java b/src/club/wpia/gigi/database/DBEnum.java similarity index 64% rename from src/org/cacert/gigi/database/DBEnum.java rename to src/club/wpia/gigi/database/DBEnum.java index 72c45a16..8f2dc776 100644 --- a/src/org/cacert/gigi/database/DBEnum.java +++ b/src/club/wpia/gigi/database/DBEnum.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.database; +package club.wpia.gigi.database; public interface DBEnum { diff --git a/src/org/cacert/gigi/database/DatabaseConnection.java b/src/club/wpia/gigi/database/DatabaseConnection.java similarity index 99% rename from src/org/cacert/gigi/database/DatabaseConnection.java rename to src/club/wpia/gigi/database/DatabaseConnection.java index 2bdf9f1c..0d595707 100644 --- a/src/org/cacert/gigi/database/DatabaseConnection.java +++ b/src/club/wpia/gigi/database/DatabaseConnection.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.database; +package club.wpia.gigi.database; import java.io.IOException; import java.io.InputStream; @@ -18,7 +18,7 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.cacert.gigi.database.SQLFileManager.ImportType; +import club.wpia.gigi.database.SQLFileManager.ImportType; public class DatabaseConnection { diff --git a/src/org/cacert/gigi/database/GigiPreparedStatement.java b/src/club/wpia/gigi/database/GigiPreparedStatement.java similarity index 99% rename from src/org/cacert/gigi/database/GigiPreparedStatement.java rename to src/club/wpia/gigi/database/GigiPreparedStatement.java index 4dea5f98..4957d4d3 100644 --- a/src/org/cacert/gigi/database/GigiPreparedStatement.java +++ b/src/club/wpia/gigi/database/GigiPreparedStatement.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.database; +package club.wpia.gigi.database; import java.sql.Date; import java.sql.PreparedStatement; diff --git a/src/org/cacert/gigi/database/GigiResultSet.java b/src/club/wpia/gigi/database/GigiResultSet.java similarity index 99% rename from src/org/cacert/gigi/database/GigiResultSet.java rename to src/club/wpia/gigi/database/GigiResultSet.java index d31c9ccb..d71d57cf 100644 --- a/src/org/cacert/gigi/database/GigiResultSet.java +++ b/src/club/wpia/gigi/database/GigiResultSet.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.database; +package club.wpia.gigi.database; import java.io.Closeable; import java.sql.Date; diff --git a/src/org/cacert/gigi/database/SQLFileManager.java b/src/club/wpia/gigi/database/SQLFileManager.java similarity index 98% rename from src/org/cacert/gigi/database/SQLFileManager.java rename to src/club/wpia/gigi/database/SQLFileManager.java index 61732182..33649247 100644 --- a/src/org/cacert/gigi/database/SQLFileManager.java +++ b/src/club/wpia/gigi/database/SQLFileManager.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.database; +package club.wpia.gigi.database; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/org/cacert/gigi/database/tableStructure.sql b/src/club/wpia/gigi/database/tableStructure.sql similarity index 100% rename from src/org/cacert/gigi/database/tableStructure.sql rename to src/club/wpia/gigi/database/tableStructure.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_1.sql b/src/club/wpia/gigi/database/upgrade/from_1.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_1.sql rename to src/club/wpia/gigi/database/upgrade/from_1.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_10.sql b/src/club/wpia/gigi/database/upgrade/from_10.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_10.sql rename to src/club/wpia/gigi/database/upgrade/from_10.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_11.sql b/src/club/wpia/gigi/database/upgrade/from_11.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_11.sql rename to src/club/wpia/gigi/database/upgrade/from_11.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_12.sql b/src/club/wpia/gigi/database/upgrade/from_12.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_12.sql rename to src/club/wpia/gigi/database/upgrade/from_12.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_13.sql b/src/club/wpia/gigi/database/upgrade/from_13.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_13.sql rename to src/club/wpia/gigi/database/upgrade/from_13.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_14.sql b/src/club/wpia/gigi/database/upgrade/from_14.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_14.sql rename to src/club/wpia/gigi/database/upgrade/from_14.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_15.sql b/src/club/wpia/gigi/database/upgrade/from_15.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_15.sql rename to src/club/wpia/gigi/database/upgrade/from_15.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_16.sql b/src/club/wpia/gigi/database/upgrade/from_16.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_16.sql rename to src/club/wpia/gigi/database/upgrade/from_16.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_17.sql b/src/club/wpia/gigi/database/upgrade/from_17.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_17.sql rename to src/club/wpia/gigi/database/upgrade/from_17.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_18.sql b/src/club/wpia/gigi/database/upgrade/from_18.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_18.sql rename to src/club/wpia/gigi/database/upgrade/from_18.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_19.sql b/src/club/wpia/gigi/database/upgrade/from_19.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_19.sql rename to src/club/wpia/gigi/database/upgrade/from_19.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_2.sql b/src/club/wpia/gigi/database/upgrade/from_2.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_2.sql rename to src/club/wpia/gigi/database/upgrade/from_2.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_20.sql b/src/club/wpia/gigi/database/upgrade/from_20.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_20.sql rename to src/club/wpia/gigi/database/upgrade/from_20.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_21.sql b/src/club/wpia/gigi/database/upgrade/from_21.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_21.sql rename to src/club/wpia/gigi/database/upgrade/from_21.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_22.sql b/src/club/wpia/gigi/database/upgrade/from_22.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_22.sql rename to src/club/wpia/gigi/database/upgrade/from_22.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_23.sql b/src/club/wpia/gigi/database/upgrade/from_23.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_23.sql rename to src/club/wpia/gigi/database/upgrade/from_23.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_24.sql b/src/club/wpia/gigi/database/upgrade/from_24.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_24.sql rename to src/club/wpia/gigi/database/upgrade/from_24.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_25.sql b/src/club/wpia/gigi/database/upgrade/from_25.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_25.sql rename to src/club/wpia/gigi/database/upgrade/from_25.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_3.sql b/src/club/wpia/gigi/database/upgrade/from_3.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_3.sql rename to src/club/wpia/gigi/database/upgrade/from_3.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_4.sql b/src/club/wpia/gigi/database/upgrade/from_4.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_4.sql rename to src/club/wpia/gigi/database/upgrade/from_4.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_5.sql b/src/club/wpia/gigi/database/upgrade/from_5.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_5.sql rename to src/club/wpia/gigi/database/upgrade/from_5.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_6.sql b/src/club/wpia/gigi/database/upgrade/from_6.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_6.sql rename to src/club/wpia/gigi/database/upgrade/from_6.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_7.sql b/src/club/wpia/gigi/database/upgrade/from_7.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_7.sql rename to src/club/wpia/gigi/database/upgrade/from_7.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_8.sql b/src/club/wpia/gigi/database/upgrade/from_8.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_8.sql rename to src/club/wpia/gigi/database/upgrade/from_8.sql diff --git a/src/org/cacert/gigi/database/upgrade/from_9.sql b/src/club/wpia/gigi/database/upgrade/from_9.sql similarity index 100% rename from src/org/cacert/gigi/database/upgrade/from_9.sql rename to src/club/wpia/gigi/database/upgrade/from_9.sql diff --git a/src/org/cacert/gigi/dbObjects/Assurance.java b/src/club/wpia/gigi/dbObjects/Assurance.java similarity index 93% rename from src/org/cacert/gigi/dbObjects/Assurance.java rename to src/club/wpia/gigi/dbObjects/Assurance.java index 07c3a39b..77d8098b 100644 --- a/src/org/cacert/gigi/dbObjects/Assurance.java +++ b/src/club/wpia/gigi/dbObjects/Assurance.java @@ -1,9 +1,9 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.util.Date; -import org.cacert.gigi.database.DBEnum; -import org.cacert.gigi.dbObjects.wrappers.DataContainer; +import club.wpia.gigi.database.DBEnum; +import club.wpia.gigi.dbObjects.wrappers.DataContainer; @DataContainer public class Assurance { diff --git a/src/org/cacert/gigi/dbObjects/CACertificate.java b/src/club/wpia/gigi/dbObjects/CACertificate.java similarity index 97% rename from src/org/cacert/gigi/dbObjects/CACertificate.java rename to src/club/wpia/gigi/dbObjects/CACertificate.java index bc96a5a5..a1a8f9bd 100644 --- a/src/org/cacert/gigi/dbObjects/CACertificate.java +++ b/src/club/wpia/gigi/dbObjects/CACertificate.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.io.File; import java.io.FileInputStream; @@ -13,9 +13,9 @@ import java.util.HashMap; import javax.security.auth.x500.X500Principal; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.util.ServerConstants; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.util.ServerConstants; public class CACertificate implements IdCachable { diff --git a/src/org/cacert/gigi/dbObjects/CATS.java b/src/club/wpia/gigi/dbObjects/CATS.java similarity index 94% rename from src/org/cacert/gigi/dbObjects/CATS.java rename to src/club/wpia/gigi/dbObjects/CATS.java index df851728..3ed2c923 100644 --- a/src/org/cacert/gigi/dbObjects/CATS.java +++ b/src/club/wpia/gigi/dbObjects/CATS.java @@ -1,12 +1,12 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.sql.Timestamp; import java.util.Date; import java.util.HashMap; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.util.TimeConditions; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.util.TimeConditions; public class CATS { diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/club/wpia/gigi/dbObjects/Certificate.java similarity index 97% rename from src/org/cacert/gigi/dbObjects/Certificate.java rename to src/club/wpia/gigi/dbObjects/Certificate.java index 2aecedf7..72cd3c19 100644 --- a/src/org/cacert/gigi/dbObjects/Certificate.java +++ b/src/club/wpia/gigi/dbObjects/Certificate.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.io.File; import java.io.FileInputStream; @@ -16,14 +16,14 @@ import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.DBEnum; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.TranslateCommand; -import org.cacert.gigi.pages.account.certs.CertificateRequest; -import org.cacert.gigi.util.KeyStorage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.DBEnum; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.TranslateCommand; +import club.wpia.gigi.pages.account.certs.CertificateRequest; +import club.wpia.gigi.util.KeyStorage; public class Certificate implements IdCachable { diff --git a/src/org/cacert/gigi/dbObjects/CertificateOwner.java b/src/club/wpia/gigi/dbObjects/CertificateOwner.java similarity index 96% rename from src/org/cacert/gigi/dbObjects/CertificateOwner.java rename to src/club/wpia/gigi/dbObjects/CertificateOwner.java index a66229fe..1783394c 100644 --- a/src/org/cacert/gigi/dbObjects/CertificateOwner.java +++ b/src/club/wpia/gigi/dbObjects/CertificateOwner.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.io.IOException; import java.io.ObjectInputStream; @@ -8,9 +8,9 @@ import java.io.Serializable; import java.util.LinkedList; import java.util.List; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; public abstract class CertificateOwner implements IdCachable, Serializable { diff --git a/src/org/cacert/gigi/dbObjects/CertificateProfile.java b/src/club/wpia/gigi/dbObjects/CertificateProfile.java similarity index 98% rename from src/org/cacert/gigi/dbObjects/CertificateProfile.java rename to src/club/wpia/gigi/dbObjects/CertificateProfile.java index afcc019c..8940da38 100644 --- a/src/org/cacert/gigi/dbObjects/CertificateProfile.java +++ b/src/club/wpia/gigi/dbObjects/CertificateProfile.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.io.File; import java.io.FileInputStream; @@ -10,8 +10,8 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; public class CertificateProfile implements IdCachable { diff --git a/src/org/cacert/gigi/dbObjects/Country.java b/src/club/wpia/gigi/dbObjects/Country.java similarity index 95% rename from src/org/cacert/gigi/dbObjects/Country.java rename to src/club/wpia/gigi/dbObjects/Country.java index dedaa7e0..0501fccf 100644 --- a/src/org/cacert/gigi/dbObjects/Country.java +++ b/src/club/wpia/gigi/dbObjects/Country.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.util.ArrayList; import java.util.Collections; @@ -8,10 +8,10 @@ import java.util.List; import java.util.Map; import java.util.RandomAccess; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.output.template.SprintfCommand; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.output.template.SprintfCommand; /** * Represents a country containing its ISO 3166-1-Code and its English name. diff --git a/src/org/cacert/gigi/dbObjects/Digest.java b/src/club/wpia/gigi/dbObjects/Digest.java similarity index 76% rename from src/org/cacert/gigi/dbObjects/Digest.java rename to src/club/wpia/gigi/dbObjects/Digest.java index 1bf2b77b..19c61633 100644 --- a/src/org/cacert/gigi/dbObjects/Digest.java +++ b/src/club/wpia/gigi/dbObjects/Digest.java @@ -1,10 +1,11 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.TranslateCommand; -import org.cacert.gigi.output.template.SprintfCommand; import java.util.Arrays; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.output.template.TranslateCommand; + public enum Digest { SHA256(new SprintfCommand("Most compatible choice (see {0}documentation{1} for details)", Arrays.asList("!'", "!'"))), SHA384("Best matched with ECC P-384"), diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/club/wpia/gigi/dbObjects/Domain.java similarity index 97% rename from src/org/cacert/gigi/dbObjects/Domain.java rename to src/club/wpia/gigi/dbObjects/Domain.java index f7c963c9..d7de209c 100644 --- a/src/org/cacert/gigi/dbObjects/Domain.java +++ b/src/club/wpia/gigi/dbObjects/Domain.java @@ -1,13 +1,13 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.util.DomainAssessment; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.util.DomainAssessment; public class Domain implements IdCachable, Verifyable { diff --git a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java b/src/club/wpia/gigi/dbObjects/DomainPingConfiguration.java similarity index 91% rename from src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java rename to src/club/wpia/gigi/dbObjects/DomainPingConfiguration.java index 772b066f..bdaad758 100644 --- a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java +++ b/src/club/wpia/gigi/dbObjects/DomainPingConfiguration.java @@ -1,12 +1,12 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.util.Date; -import org.cacert.gigi.Gigi; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.output.template.SprintfCommand; +import club.wpia.gigi.Gigi; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.output.template.SprintfCommand; public class DomainPingConfiguration implements IdCachable { diff --git a/src/org/cacert/gigi/dbObjects/DomainPingExecution.java b/src/club/wpia/gigi/dbObjects/DomainPingExecution.java similarity index 91% rename from src/org/cacert/gigi/dbObjects/DomainPingExecution.java rename to src/club/wpia/gigi/dbObjects/DomainPingExecution.java index 85122854..174b2a18 100644 --- a/src/org/cacert/gigi/dbObjects/DomainPingExecution.java +++ b/src/club/wpia/gigi/dbObjects/DomainPingExecution.java @@ -1,9 +1,9 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.sql.Timestamp; import java.util.Date; -import org.cacert.gigi.database.GigiResultSet; +import club.wpia.gigi.database.GigiResultSet; public class DomainPingExecution { diff --git a/src/org/cacert/gigi/dbObjects/DomainPingType.java b/src/club/wpia/gigi/dbObjects/DomainPingType.java similarity index 69% rename from src/org/cacert/gigi/dbObjects/DomainPingType.java rename to src/club/wpia/gigi/dbObjects/DomainPingType.java index d86970b7..3f4b474a 100644 --- a/src/org/cacert/gigi/dbObjects/DomainPingType.java +++ b/src/club/wpia/gigi/dbObjects/DomainPingType.java @@ -1,6 +1,6 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; -import org.cacert.gigi.database.DBEnum; +import club.wpia.gigi.database.DBEnum; public enum DomainPingType implements DBEnum { EMAIL, DNS, HTTP, SSL; diff --git a/src/org/cacert/gigi/dbObjects/EmailAddress.java b/src/club/wpia/gigi/dbObjects/EmailAddress.java similarity index 94% rename from src/org/cacert/gigi/dbObjects/EmailAddress.java rename to src/club/wpia/gigi/dbObjects/EmailAddress.java index 78470359..319e415b 100644 --- a/src/org/cacert/gigi/dbObjects/EmailAddress.java +++ b/src/club/wpia/gigi/dbObjects/EmailAddress.java @@ -1,18 +1,18 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.io.IOException; import java.util.Date; import java.util.LinkedList; import java.util.Locale; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.email.EmailProvider; -import org.cacert.gigi.email.MailProbe; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.SprintfCommand; -import org.cacert.gigi.util.RandomToken; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.email.EmailProvider; +import club.wpia.gigi.email.MailProbe; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.util.RandomToken; public class EmailAddress implements IdCachable, Verifyable { diff --git a/src/org/cacert/gigi/dbObjects/Group.java b/src/club/wpia/gigi/dbObjects/Group.java similarity index 93% rename from src/org/cacert/gigi/dbObjects/Group.java rename to src/club/wpia/gigi/dbObjects/Group.java index 91becaf8..1acc461b 100644 --- a/src/org/cacert/gigi/dbObjects/Group.java +++ b/src/club/wpia/gigi/dbObjects/Group.java @@ -1,10 +1,10 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; -import org.cacert.gigi.database.DBEnum; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.TranslateCommand; +import club.wpia.gigi.database.DBEnum; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.TranslateCommand; public enum Group implements DBEnum { SUPPORTER("supporter", "supporter", true, false, true), // diff --git a/src/org/cacert/gigi/dbObjects/IdCachable.java b/src/club/wpia/gigi/dbObjects/IdCachable.java similarity index 62% rename from src/org/cacert/gigi/dbObjects/IdCachable.java rename to src/club/wpia/gigi/dbObjects/IdCachable.java index af439bcf..3dc3d80e 100644 --- a/src/org/cacert/gigi/dbObjects/IdCachable.java +++ b/src/club/wpia/gigi/dbObjects/IdCachable.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; public interface IdCachable { diff --git a/src/org/cacert/gigi/dbObjects/Job.java b/src/club/wpia/gigi/dbObjects/Job.java similarity index 91% rename from src/org/cacert/gigi/dbObjects/Job.java rename to src/club/wpia/gigi/dbObjects/Job.java index 4fa29738..ea8fc97d 100644 --- a/src/org/cacert/gigi/dbObjects/Job.java +++ b/src/club/wpia/gigi/dbObjects/Job.java @@ -1,12 +1,12 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.sql.Date; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.DBEnum; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.output.CertificateValiditySelector; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.DBEnum; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.output.CertificateValiditySelector; public class Job implements IdCachable { diff --git a/src/org/cacert/gigi/dbObjects/Name.java b/src/club/wpia/gigi/dbObjects/Name.java similarity index 97% rename from src/org/cacert/gigi/dbObjects/Name.java rename to src/club/wpia/gigi/dbObjects/Name.java index df9e1ff6..f4d002ec 100644 --- a/src/org/cacert/gigi/dbObjects/Name.java +++ b/src/club/wpia/gigi/dbObjects/Name.java @@ -1,16 +1,16 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.io.PrintWriter; import java.util.Map; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.DBEnum; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.NamePart.NamePartType; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.util.HTMLEncoder; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.DBEnum; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.dbObjects.NamePart.NamePartType; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.util.HTMLEncoder; public class Name implements Outputable, IdCachable { diff --git a/src/org/cacert/gigi/dbObjects/NamePart.java b/src/club/wpia/gigi/dbObjects/NamePart.java similarity index 91% rename from src/org/cacert/gigi/dbObjects/NamePart.java rename to src/club/wpia/gigi/dbObjects/NamePart.java index 25a0a546..8889f8ad 100644 --- a/src/org/cacert/gigi/dbObjects/NamePart.java +++ b/src/club/wpia/gigi/dbObjects/NamePart.java @@ -1,8 +1,8 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; -import org.cacert.gigi.database.DBEnum; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.wrappers.DataContainer; +import club.wpia.gigi.database.DBEnum; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.dbObjects.wrappers.DataContainer; @DataContainer public class NamePart { diff --git a/src/org/cacert/gigi/dbObjects/ObjectCache.java b/src/club/wpia/gigi/dbObjects/ObjectCache.java similarity index 96% rename from src/org/cacert/gigi/dbObjects/ObjectCache.java rename to src/club/wpia/gigi/dbObjects/ObjectCache.java index 125477de..cc2e1ea3 100644 --- a/src/org/cacert/gigi/dbObjects/ObjectCache.java +++ b/src/club/wpia/gigi/dbObjects/ObjectCache.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.lang.ref.WeakReference; import java.util.HashMap; diff --git a/src/org/cacert/gigi/dbObjects/Organisation.java b/src/club/wpia/gigi/dbObjects/Organisation.java similarity index 96% rename from src/org/cacert/gigi/dbObjects/Organisation.java rename to src/club/wpia/gigi/dbObjects/Organisation.java index cb6601e6..6e481855 100644 --- a/src/org/cacert/gigi/dbObjects/Organisation.java +++ b/src/club/wpia/gigi/dbObjects/Organisation.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.io.IOException; import java.io.ObjectInputStream; @@ -6,12 +6,12 @@ import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.List; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.dbObjects.wrappers.DataContainer; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.dbObjects.wrappers.DataContainer; public class Organisation extends CertificateOwner { diff --git a/src/org/cacert/gigi/dbObjects/SupportNotificationMail.templ b/src/club/wpia/gigi/dbObjects/SupportNotificationMail.templ similarity index 100% rename from src/org/cacert/gigi/dbObjects/SupportNotificationMail.templ rename to src/club/wpia/gigi/dbObjects/SupportNotificationMail.templ diff --git a/src/org/cacert/gigi/dbObjects/SupportUserNotificationMail.templ b/src/club/wpia/gigi/dbObjects/SupportUserNotificationMail.templ similarity index 100% rename from src/org/cacert/gigi/dbObjects/SupportUserNotificationMail.templ rename to src/club/wpia/gigi/dbObjects/SupportUserNotificationMail.templ diff --git a/src/org/cacert/gigi/dbObjects/SupportedUser.java b/src/club/wpia/gigi/dbObjects/SupportedUser.java similarity index 93% rename from src/org/cacert/gigi/dbObjects/SupportedUser.java rename to src/club/wpia/gigi/dbObjects/SupportedUser.java index e600b85b..c9364f4e 100644 --- a/src/org/cacert/gigi/dbObjects/SupportedUser.java +++ b/src/club/wpia/gigi/dbObjects/SupportedUser.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.io.IOException; import java.util.HashMap; @@ -6,17 +6,17 @@ import java.util.Locale; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.MailTemplate; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.SprintfCommand; -import org.cacert.gigi.output.template.TranslateCommand; -import org.cacert.gigi.pages.PasswordResetPage; -import org.cacert.gigi.util.DayDate; -import org.cacert.gigi.util.ServerConstants; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.MailTemplate; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.output.template.TranslateCommand; +import club.wpia.gigi.pages.PasswordResetPage; +import club.wpia.gigi.util.DayDate; +import club.wpia.gigi.util.ServerConstants; public class SupportedUser { diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/club/wpia/gigi/dbObjects/User.java similarity index 96% rename from src/org/cacert/gigi/dbObjects/User.java rename to src/club/wpia/gigi/dbObjects/User.java index ad2d3867..1172c7e4 100644 --- a/src/org/cacert/gigi/dbObjects/User.java +++ b/src/club/wpia/gigi/dbObjects/User.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import java.io.IOException; import java.io.ObjectInputStream; @@ -11,21 +11,21 @@ import java.util.List; import java.util.Locale; import java.util.Set; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.Assurance.AssuranceType; -import org.cacert.gigi.dbObjects.CATS.CATSType; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.DateSelector; -import org.cacert.gigi.pages.PasswordResetPage; -import org.cacert.gigi.util.CalendarUtil; -import org.cacert.gigi.util.DayDate; -import org.cacert.gigi.util.Notary; -import org.cacert.gigi.util.PasswordHash; -import org.cacert.gigi.util.PasswordStrengthChecker; -import org.cacert.gigi.util.TimeConditions; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.dbObjects.Assurance.AssuranceType; +import club.wpia.gigi.dbObjects.CATS.CATSType; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.DateSelector; +import club.wpia.gigi.pages.PasswordResetPage; +import club.wpia.gigi.util.CalendarUtil; +import club.wpia.gigi.util.DayDate; +import club.wpia.gigi.util.Notary; +import club.wpia.gigi.util.PasswordHash; +import club.wpia.gigi.util.PasswordStrengthChecker; +import club.wpia.gigi.util.TimeConditions; /** * Represents an acting, assurable, user. Synchronizing on user means: no diff --git a/src/org/cacert/gigi/dbObjects/Verifyable.java b/src/club/wpia/gigi/dbObjects/Verifyable.java similarity index 68% rename from src/org/cacert/gigi/dbObjects/Verifyable.java rename to src/club/wpia/gigi/dbObjects/Verifyable.java index ba4dd0c5..7bbd3546 100644 --- a/src/org/cacert/gigi/dbObjects/Verifyable.java +++ b/src/club/wpia/gigi/dbObjects/Verifyable.java @@ -1,6 +1,6 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; -import org.cacert.gigi.GigiApiException; +import club.wpia.gigi.GigiApiException; public interface Verifyable { diff --git a/src/org/cacert/gigi/dbObjects/wrappers/DataContainer.java b/src/club/wpia/gigi/dbObjects/wrappers/DataContainer.java similarity index 76% rename from src/org/cacert/gigi/dbObjects/wrappers/DataContainer.java rename to src/club/wpia/gigi/dbObjects/wrappers/DataContainer.java index db14af60..62d10e15 100644 --- a/src/org/cacert/gigi/dbObjects/wrappers/DataContainer.java +++ b/src/club/wpia/gigi/dbObjects/wrappers/DataContainer.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects.wrappers; +package club.wpia.gigi.dbObjects.wrappers; import java.lang.annotation.ElementType; import java.lang.annotation.Target; diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/club/wpia/gigi/email/EmailProvider.java similarity index 96% rename from src/org/cacert/gigi/email/EmailProvider.java rename to src/club/wpia/gigi/email/EmailProvider.java index c053caf8..c6bef2f9 100644 --- a/src/org/cacert/gigi/email/EmailProvider.java +++ b/src/club/wpia/gigi/email/EmailProvider.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.email; +package club.wpia.gigi.email; import java.io.BufferedReader; import java.io.IOException; @@ -19,11 +19,11 @@ import java.util.regex.Pattern; import javax.naming.NamingException; import javax.net.ssl.SSLSocketFactory; -import org.cacert.gigi.crypto.SMIME; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.util.DNSUtil; -import org.cacert.gigi.util.DomainAssessment; -import org.cacert.gigi.util.SystemKeywords; +import club.wpia.gigi.crypto.SMIME; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.util.DNSUtil; +import club.wpia.gigi.util.DomainAssessment; +import club.wpia.gigi.util.SystemKeywords; public abstract class EmailProvider { diff --git a/src/org/cacert/gigi/email/MailProbe.java b/src/club/wpia/gigi/email/MailProbe.java similarity index 76% rename from src/org/cacert/gigi/email/MailProbe.java rename to src/club/wpia/gigi/email/MailProbe.java index 4da2648a..4ecd2980 100644 --- a/src/org/cacert/gigi/email/MailProbe.java +++ b/src/club/wpia/gigi/email/MailProbe.java @@ -1,11 +1,11 @@ -package org.cacert.gigi.email; +package club.wpia.gigi.email; import java.io.IOException; import java.util.HashMap; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.MailTemplate; -import org.cacert.gigi.util.ServerConstants; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.MailTemplate; +import club.wpia.gigi.util.ServerConstants; public class MailProbe { diff --git a/src/org/cacert/gigi/email/MailProbe.templ b/src/club/wpia/gigi/email/MailProbe.templ similarity index 100% rename from src/org/cacert/gigi/email/MailProbe.templ rename to src/club/wpia/gigi/email/MailProbe.templ diff --git a/src/org/cacert/gigi/email/SendMail.java b/src/club/wpia/gigi/email/SendMail.java similarity index 96% rename from src/org/cacert/gigi/email/SendMail.java rename to src/club/wpia/gigi/email/SendMail.java index 81d26ca5..cef6381c 100644 --- a/src/org/cacert/gigi/email/SendMail.java +++ b/src/club/wpia/gigi/email/SendMail.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.email; +package club.wpia.gigi.email; import java.io.BufferedReader; import java.io.IOException; @@ -14,9 +14,9 @@ import java.util.Locale; import java.util.Properties; import java.util.regex.Pattern; -import org.cacert.gigi.util.PEM; -import org.cacert.gigi.util.ServerConstants; -import org.cacert.gigi.util.SystemKeywords; +import club.wpia.gigi.util.PEM; +import club.wpia.gigi.util.ServerConstants; +import club.wpia.gigi.util.SystemKeywords; public class SendMail extends EmailProvider { diff --git a/src/org/cacert/gigi/localisation/Language.java b/src/club/wpia/gigi/localisation/Language.java similarity index 99% rename from src/org/cacert/gigi/localisation/Language.java rename to src/club/wpia/gigi/localisation/Language.java index 4caaa79b..3cdb7d19 100644 --- a/src/org/cacert/gigi/localisation/Language.java +++ b/src/club/wpia/gigi/localisation/Language.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.localisation; +package club.wpia.gigi.localisation; import java.io.File; import java.io.FileInputStream; diff --git a/src/org/cacert/gigi/natives/SetUID.java b/src/club/wpia/gigi/natives/SetUID.java similarity index 95% rename from src/org/cacert/gigi/natives/SetUID.java rename to src/club/wpia/gigi/natives/SetUID.java index a4a5d859..dbc318ac 100644 --- a/src/org/cacert/gigi/natives/SetUID.java +++ b/src/club/wpia/gigi/natives/SetUID.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.natives; +package club.wpia.gigi.natives; import java.io.File; diff --git a/src/org/cacert/gigi/output/ArrayIterable.java b/src/club/wpia/gigi/output/ArrayIterable.java similarity index 78% rename from src/org/cacert/gigi/output/ArrayIterable.java rename to src/club/wpia/gigi/output/ArrayIterable.java index 90bad436..29fa8415 100644 --- a/src/org/cacert/gigi/output/ArrayIterable.java +++ b/src/club/wpia/gigi/output/ArrayIterable.java @@ -1,9 +1,9 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.util.Map; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.IterableDataset; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.IterableDataset; public abstract class ArrayIterable implements IterableDataset { diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/club/wpia/gigi/output/AssurancesDisplay.java similarity index 90% rename from src/org/cacert/gigi/output/AssurancesDisplay.java rename to src/club/wpia/gigi/output/AssurancesDisplay.java index 86034158..84822dd6 100644 --- a/src/org/cacert/gigi/output/AssurancesDisplay.java +++ b/src/club/wpia/gigi/output/AssurancesDisplay.java @@ -1,14 +1,14 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.PrintWriter; import java.util.Map; -import org.cacert.gigi.dbObjects.Assurance; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.dbObjects.Assurance; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.Template; public class AssurancesDisplay implements Outputable { diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.templ b/src/club/wpia/gigi/output/AssurancesDisplay.templ similarity index 100% rename from src/org/cacert/gigi/output/AssurancesDisplay.templ rename to src/club/wpia/gigi/output/AssurancesDisplay.templ diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/club/wpia/gigi/output/CertificateIterable.java similarity index 89% rename from src/org/cacert/gigi/output/CertificateIterable.java rename to src/club/wpia/gigi/output/CertificateIterable.java index 9e551411..6d12a3da 100644 --- a/src/org/cacert/gigi/output/CertificateIterable.java +++ b/src/club/wpia/gigi/output/CertificateIterable.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.IOException; import java.security.GeneralSecurityException; @@ -6,11 +6,11 @@ import java.security.cert.X509Certificate; import java.util.Date; import java.util.Map; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.util.CalendarUtil; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.util.CalendarUtil; public class CertificateIterable implements IterableDataset { diff --git a/src/org/cacert/gigi/output/CertificateTable.templ b/src/club/wpia/gigi/output/CertificateTable.templ similarity index 100% rename from src/org/cacert/gigi/output/CertificateTable.templ rename to src/club/wpia/gigi/output/CertificateTable.templ diff --git a/src/org/cacert/gigi/output/CertificateValiditySelector.java b/src/club/wpia/gigi/output/CertificateValiditySelector.java similarity index 95% rename from src/org/cacert/gigi/output/CertificateValiditySelector.java rename to src/club/wpia/gigi/output/CertificateValiditySelector.java index d0f0c124..2ae555d3 100644 --- a/src/org/cacert/gigi/output/CertificateValiditySelector.java +++ b/src/club/wpia/gigi/output/CertificateValiditySelector.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.PrintWriter; import java.sql.Date; @@ -7,10 +7,10 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.util.HTMLEncoder; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.util.HTMLEncoder; public class CertificateValiditySelector implements Outputable { diff --git a/src/org/cacert/gigi/output/ClientCSRGenerate.java b/src/club/wpia/gigi/output/ClientCSRGenerate.java similarity index 85% rename from src/org/cacert/gigi/output/ClientCSRGenerate.java rename to src/club/wpia/gigi/output/ClientCSRGenerate.java index 3d4418e1..1eaa6421 100644 --- a/src/org/cacert/gigi/output/ClientCSRGenerate.java +++ b/src/club/wpia/gigi/output/ClientCSRGenerate.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.IOException; import java.util.HashMap; @@ -6,9 +6,9 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.ServerConstants; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.ServerConstants; public class ClientCSRGenerate { diff --git a/src/org/cacert/gigi/output/ClientCSRGenerate.templ b/src/club/wpia/gigi/output/ClientCSRGenerate.templ similarity index 100% rename from src/org/cacert/gigi/output/ClientCSRGenerate.templ rename to src/club/wpia/gigi/output/ClientCSRGenerate.templ diff --git a/src/org/cacert/gigi/output/CountrySelector.java b/src/club/wpia/gigi/output/CountrySelector.java similarity index 85% rename from src/org/cacert/gigi/output/CountrySelector.java rename to src/club/wpia/gigi/output/CountrySelector.java index bb1fab92..03d85d5d 100644 --- a/src/org/cacert/gigi/output/CountrySelector.java +++ b/src/club/wpia/gigi/output/CountrySelector.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.PrintWriter; import java.util.List; @@ -6,12 +6,12 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Country; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.Template; public class CountrySelector implements Outputable { diff --git a/src/org/cacert/gigi/output/CountrySelector.templ b/src/club/wpia/gigi/output/CountrySelector.templ similarity index 100% rename from src/org/cacert/gigi/output/CountrySelector.templ rename to src/club/wpia/gigi/output/CountrySelector.templ diff --git a/src/org/cacert/gigi/output/DateSelector.java b/src/club/wpia/gigi/output/DateSelector.java similarity index 93% rename from src/org/cacert/gigi/output/DateSelector.java rename to src/club/wpia/gigi/output/DateSelector.java index 2557282a..bb9c8ab6 100644 --- a/src/org/cacert/gigi/output/DateSelector.java +++ b/src/club/wpia/gigi/output/DateSelector.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.PrintWriter; import java.text.SimpleDateFormat; @@ -9,12 +9,12 @@ import java.util.TimeZone; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.util.CalendarUtil; -import org.cacert.gigi.util.DayDate; -import org.cacert.gigi.util.HTMLEncoder; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.util.CalendarUtil; +import club.wpia.gigi.util.DayDate; +import club.wpia.gigi.util.HTMLEncoder; public class DateSelector implements Outputable { diff --git a/src/org/cacert/gigi/output/GroupIterator.java b/src/club/wpia/gigi/output/GroupIterator.java similarity index 81% rename from src/org/cacert/gigi/output/GroupIterator.java rename to src/club/wpia/gigi/output/GroupIterator.java index 4e35db48..d195c6ca 100644 --- a/src/org/cacert/gigi/output/GroupIterator.java +++ b/src/club/wpia/gigi/output/GroupIterator.java @@ -1,11 +1,11 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.util.Iterator; import java.util.Map; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.IterableDataset; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.IterableDataset; public class GroupIterator implements IterableDataset { diff --git a/src/org/cacert/gigi/output/GroupSelector.java b/src/club/wpia/gigi/output/GroupSelector.java similarity index 86% rename from src/org/cacert/gigi/output/GroupSelector.java rename to src/club/wpia/gigi/output/GroupSelector.java index 9d3080dd..ace2193f 100644 --- a/src/org/cacert/gigi/output/GroupSelector.java +++ b/src/club/wpia/gigi/output/GroupSelector.java @@ -1,15 +1,15 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.util.HTMLEncoder; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.util.HTMLEncoder; public class GroupSelector implements Outputable { diff --git a/src/org/cacert/gigi/output/HashAlgorithms.java b/src/club/wpia/gigi/output/HashAlgorithms.java similarity index 79% rename from src/org/cacert/gigi/output/HashAlgorithms.java rename to src/club/wpia/gigi/output/HashAlgorithms.java index fe29d625..e6d670d9 100644 --- a/src/org/cacert/gigi/output/HashAlgorithms.java +++ b/src/club/wpia/gigi/output/HashAlgorithms.java @@ -1,10 +1,10 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.util.Map; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.IterableDataset; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.IterableDataset; public class HashAlgorithms implements IterableDataset { diff --git a/src/org/cacert/gigi/output/IMenuItem.java b/src/club/wpia/gigi/output/IMenuItem.java similarity index 58% rename from src/org/cacert/gigi/output/IMenuItem.java rename to src/club/wpia/gigi/output/IMenuItem.java index 5e85f627..105c8706 100644 --- a/src/org/cacert/gigi/output/IMenuItem.java +++ b/src/club/wpia/gigi/output/IMenuItem.java @@ -1,7 +1,7 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; -import org.cacert.gigi.PermissionCheckable; -import org.cacert.gigi.output.template.Outputable; +import club.wpia.gigi.PermissionCheckable; +import club.wpia.gigi.output.template.Outputable; /** * Markerinterface for an {@link Outputable} speicially used in a {@link Menu}. diff --git a/src/org/cacert/gigi/output/IterableIterable.java b/src/club/wpia/gigi/output/IterableIterable.java similarity index 80% rename from src/org/cacert/gigi/output/IterableIterable.java rename to src/club/wpia/gigi/output/IterableIterable.java index bf2ab07b..28ba657a 100644 --- a/src/org/cacert/gigi/output/IterableIterable.java +++ b/src/club/wpia/gigi/output/IterableIterable.java @@ -1,10 +1,10 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.util.Iterator; import java.util.Map; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.IterableDataset; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.IterableDataset; public abstract class IterableIterable implements IterableDataset { diff --git a/src/org/cacert/gigi/output/Menu.java b/src/club/wpia/gigi/output/Menu.java similarity index 93% rename from src/org/cacert/gigi/output/Menu.java rename to src/club/wpia/gigi/output/Menu.java index f351b732..e83ce6e0 100644 --- a/src/org/cacert/gigi/output/Menu.java +++ b/src/club/wpia/gigi/output/Menu.java @@ -1,11 +1,11 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.PrintWriter; import java.util.LinkedList; import java.util.Map; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.util.AuthorizationContext; public class Menu implements IMenuItem { diff --git a/src/org/cacert/gigi/output/MenuCollector.java b/src/club/wpia/gigi/output/MenuCollector.java similarity index 81% rename from src/org/cacert/gigi/output/MenuCollector.java rename to src/club/wpia/gigi/output/MenuCollector.java index 7a5a0599..d5280f0a 100644 --- a/src/org/cacert/gigi/output/MenuCollector.java +++ b/src/club/wpia/gigi/output/MenuCollector.java @@ -1,11 +1,11 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.PrintWriter; import java.util.LinkedList; import java.util.Map; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.util.AuthorizationContext; public class MenuCollector implements IMenuItem { diff --git a/src/org/cacert/gigi/output/NameInput.java b/src/club/wpia/gigi/output/NameInput.java similarity index 89% rename from src/org/cacert/gigi/output/NameInput.java rename to src/club/wpia/gigi/output/NameInput.java index 11415443..11c8de57 100644 --- a/src/org/cacert/gigi/output/NameInput.java +++ b/src/club/wpia/gigi/output/NameInput.java @@ -1,18 +1,18 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.dbObjects.NamePart; -import org.cacert.gigi.dbObjects.NamePart.NamePartType; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.NamePart; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.NamePart.NamePartType; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.Template; public class NameInput implements Outputable { diff --git a/src/org/cacert/gigi/output/NameInput.templ b/src/club/wpia/gigi/output/NameInput.templ similarity index 100% rename from src/org/cacert/gigi/output/NameInput.templ rename to src/club/wpia/gigi/output/NameInput.templ diff --git a/src/org/cacert/gigi/output/PageMenuItem.java b/src/club/wpia/gigi/output/PageMenuItem.java similarity index 75% rename from src/org/cacert/gigi/output/PageMenuItem.java rename to src/club/wpia/gigi/output/PageMenuItem.java index f331e3c6..fe56d599 100644 --- a/src/org/cacert/gigi/output/PageMenuItem.java +++ b/src/club/wpia/gigi/output/PageMenuItem.java @@ -1,7 +1,7 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; public class PageMenuItem extends SimpleMenuItem { diff --git a/src/org/cacert/gigi/output/SimpleMenuItem.java b/src/club/wpia/gigi/output/SimpleMenuItem.java similarity index 80% rename from src/org/cacert/gigi/output/SimpleMenuItem.java rename to src/club/wpia/gigi/output/SimpleMenuItem.java index 7def5cab..e95d92dd 100644 --- a/src/org/cacert/gigi/output/SimpleMenuItem.java +++ b/src/club/wpia/gigi/output/SimpleMenuItem.java @@ -1,8 +1,8 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.PrintWriter; -import org.cacert.gigi.localisation.Language; +import club.wpia.gigi.localisation.Language; public class SimpleMenuItem extends SimpleUntranslatedMenuItem { diff --git a/src/org/cacert/gigi/output/SimpleUntranslatedMenuItem.java b/src/club/wpia/gigi/output/SimpleUntranslatedMenuItem.java similarity index 85% rename from src/org/cacert/gigi/output/SimpleUntranslatedMenuItem.java rename to src/club/wpia/gigi/output/SimpleUntranslatedMenuItem.java index 8206a29d..4e11db84 100644 --- a/src/org/cacert/gigi/output/SimpleUntranslatedMenuItem.java +++ b/src/club/wpia/gigi/output/SimpleUntranslatedMenuItem.java @@ -1,10 +1,10 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.io.PrintWriter; import java.util.Map; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.util.AuthorizationContext; public class SimpleUntranslatedMenuItem implements IMenuItem { diff --git a/src/org/cacert/gigi/output/TrustchainIterable.java b/src/club/wpia/gigi/output/TrustchainIterable.java similarity index 76% rename from src/org/cacert/gigi/output/TrustchainIterable.java rename to src/club/wpia/gigi/output/TrustchainIterable.java index 2cee5fd5..23d66bc3 100644 --- a/src/org/cacert/gigi/output/TrustchainIterable.java +++ b/src/club/wpia/gigi/output/TrustchainIterable.java @@ -1,10 +1,10 @@ -package org.cacert.gigi.output; +package club.wpia.gigi.output; import java.util.Map; -import org.cacert.gigi.dbObjects.CACertificate; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.IterableDataset; +import club.wpia.gigi.dbObjects.CACertificate; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.IterableDataset; public class TrustchainIterable implements IterableDataset { diff --git a/src/org/cacert/gigi/output/template/ForeachStatement.java b/src/club/wpia/gigi/output/template/ForeachStatement.java similarity index 93% rename from src/org/cacert/gigi/output/template/ForeachStatement.java rename to src/club/wpia/gigi/output/template/ForeachStatement.java index 4c8b1027..63487e01 100644 --- a/src/org/cacert/gigi/output/template/ForeachStatement.java +++ b/src/club/wpia/gigi/output/template/ForeachStatement.java @@ -1,11 +1,11 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.PrintWriter; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.cacert.gigi.localisation.Language; +import club.wpia.gigi.localisation.Language; /** * Outputs an {@link Outputable} multiple times based on a given diff --git a/src/org/cacert/gigi/output/template/Form.java b/src/club/wpia/gigi/output/template/Form.java similarity index 97% rename from src/org/cacert/gigi/output/template/Form.java rename to src/club/wpia/gigi/output/template/Form.java index 82d9e600..ec3909e1 100644 --- a/src/org/cacert/gigi/output/template/Form.java +++ b/src/club/wpia/gigi/output/template/Form.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.IOException; import java.io.PrintWriter; @@ -9,10 +9,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.RandomToken; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.RandomToken; /** * A generic HTML-form that handles CSRF-token creation. diff --git a/src/org/cacert/gigi/output/template/IfStatement.java b/src/club/wpia/gigi/output/template/IfStatement.java similarity index 95% rename from src/org/cacert/gigi/output/template/IfStatement.java rename to src/club/wpia/gigi/output/template/IfStatement.java index 1b49f3b2..8b0af6a6 100644 --- a/src/org/cacert/gigi/output/template/IfStatement.java +++ b/src/club/wpia/gigi/output/template/IfStatement.java @@ -1,10 +1,10 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.PrintWriter; import java.util.Collection; import java.util.Map; -import org.cacert.gigi.localisation.Language; +import club.wpia.gigi.localisation.Language; /** * One ore two {@link Outputable}s that are emitted conditionally if a given diff --git a/src/org/cacert/gigi/output/template/IterableDataset.java b/src/club/wpia/gigi/output/template/IterableDataset.java similarity index 87% rename from src/org/cacert/gigi/output/template/IterableDataset.java rename to src/club/wpia/gigi/output/template/IterableDataset.java index 26405a54..b553fdbe 100644 --- a/src/org/cacert/gigi/output/template/IterableDataset.java +++ b/src/club/wpia/gigi/output/template/IterableDataset.java @@ -1,8 +1,8 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.util.Map; -import org.cacert.gigi.localisation.Language; +import club.wpia.gigi.localisation.Language; /** * Represents some kind of data, that may be iterated over in a template using diff --git a/src/org/cacert/gigi/output/template/MailFooter.templ b/src/club/wpia/gigi/output/template/MailFooter.templ similarity index 100% rename from src/org/cacert/gigi/output/template/MailFooter.templ rename to src/club/wpia/gigi/output/template/MailFooter.templ diff --git a/src/org/cacert/gigi/output/template/MailTemplate.java b/src/club/wpia/gigi/output/template/MailTemplate.java similarity index 95% rename from src/org/cacert/gigi/output/template/MailTemplate.java rename to src/club/wpia/gigi/output/template/MailTemplate.java index d1647a8b..48034601 100644 --- a/src/org/cacert/gigi/output/template/MailTemplate.java +++ b/src/club/wpia/gigi/output/template/MailTemplate.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.IOException; import java.io.PrintWriter; @@ -9,8 +9,8 @@ import java.net.URL; import java.util.Collection; import java.util.Map; -import org.cacert.gigi.email.SendMail; -import org.cacert.gigi.localisation.Language; +import club.wpia.gigi.email.SendMail; +import club.wpia.gigi.localisation.Language; public class MailTemplate extends Template { diff --git a/src/org/cacert/gigi/output/template/OutputVariableCommand.java b/src/club/wpia/gigi/output/template/OutputVariableCommand.java similarity index 91% rename from src/org/cacert/gigi/output/template/OutputVariableCommand.java rename to src/club/wpia/gigi/output/template/OutputVariableCommand.java index 5dce3aed..54f8dca9 100644 --- a/src/org/cacert/gigi/output/template/OutputVariableCommand.java +++ b/src/club/wpia/gigi/output/template/OutputVariableCommand.java @@ -1,10 +1,10 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.PrintWriter; import java.util.Collection; import java.util.Map; -import org.cacert.gigi.localisation.Language; +import club.wpia.gigi.localisation.Language; /** * Emits a variable. diff --git a/src/org/cacert/gigi/output/template/Outputable.java b/src/club/wpia/gigi/output/template/Outputable.java similarity index 88% rename from src/org/cacert/gigi/output/template/Outputable.java rename to src/club/wpia/gigi/output/template/Outputable.java index 1e6d9f10..836a44f4 100644 --- a/src/org/cacert/gigi/output/template/Outputable.java +++ b/src/club/wpia/gigi/output/template/Outputable.java @@ -1,9 +1,9 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.PrintWriter; import java.util.Map; -import org.cacert.gigi.localisation.Language; +import club.wpia.gigi.localisation.Language; /** * An object that is outputable to the user normally in an HTML-page. diff --git a/src/org/cacert/gigi/output/template/OutputableArrayIterable.java b/src/club/wpia/gigi/output/template/OutputableArrayIterable.java similarity index 91% rename from src/org/cacert/gigi/output/template/OutputableArrayIterable.java rename to src/club/wpia/gigi/output/template/OutputableArrayIterable.java index 49895407..ff7886d4 100644 --- a/src/org/cacert/gigi/output/template/OutputableArrayIterable.java +++ b/src/club/wpia/gigi/output/template/OutputableArrayIterable.java @@ -1,8 +1,8 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.util.Map; -import org.cacert.gigi.localisation.Language; +import club.wpia.gigi.localisation.Language; /** * Generic implementation of {@link IterableDataset} that is fed by an array. diff --git a/src/org/cacert/gigi/output/template/PlainOutputable.java b/src/club/wpia/gigi/output/template/PlainOutputable.java similarity index 78% rename from src/org/cacert/gigi/output/template/PlainOutputable.java rename to src/club/wpia/gigi/output/template/PlainOutputable.java index 3c56b7fa..a4fdb7ca 100644 --- a/src/org/cacert/gigi/output/template/PlainOutputable.java +++ b/src/club/wpia/gigi/output/template/PlainOutputable.java @@ -1,10 +1,10 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.PrintWriter; import java.util.Map; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.util.HTMLEncoder; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.util.HTMLEncoder; public class PlainOutputable implements Outputable { diff --git a/src/org/cacert/gigi/output/template/Scope.java b/src/club/wpia/gigi/output/template/Scope.java similarity index 90% rename from src/org/cacert/gigi/output/template/Scope.java rename to src/club/wpia/gigi/output/template/Scope.java index 700ccfe7..e962649d 100644 --- a/src/org/cacert/gigi/output/template/Scope.java +++ b/src/club/wpia/gigi/output/template/Scope.java @@ -1,10 +1,10 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.PrintWriter; import java.util.HashMap; import java.util.Map; -import org.cacert.gigi.localisation.Language; +import club.wpia.gigi.localisation.Language; /** * Builds a variable scope around another {@link Outputable}, statically filling diff --git a/src/org/cacert/gigi/output/template/SprintfCommand.java b/src/club/wpia/gigi/output/template/SprintfCommand.java similarity index 97% rename from src/org/cacert/gigi/output/template/SprintfCommand.java rename to src/club/wpia/gigi/output/template/SprintfCommand.java index 64ede782..6b40c8fd 100644 --- a/src/org/cacert/gigi/output/template/SprintfCommand.java +++ b/src/club/wpia/gigi/output/template/SprintfCommand.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.PrintWriter; import java.util.Arrays; @@ -10,8 +10,8 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.util.HTMLEncoder; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.util.HTMLEncoder; /** * A pattern that is to be translated before variables are inserted. diff --git a/src/org/cacert/gigi/output/template/Template.java b/src/club/wpia/gigi/output/template/Template.java similarity index 98% rename from src/org/cacert/gigi/output/template/Template.java rename to src/club/wpia/gigi/output/template/Template.java index 6aa9348a..454c0c58 100644 --- a/src/org/cacert/gigi/output/template/Template.java +++ b/src/club/wpia/gigi/output/template/Template.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.File; import java.io.FileInputStream; @@ -17,11 +17,11 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.DateSelector; -import org.cacert.gigi.util.DayDate; -import org.cacert.gigi.util.EditDistance; -import org.cacert.gigi.util.HTMLEncoder; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.DateSelector; +import club.wpia.gigi.util.DayDate; +import club.wpia.gigi.util.EditDistance; +import club.wpia.gigi.util.HTMLEncoder; /** * Represents a loaded template file. diff --git a/src/org/cacert/gigi/output/template/TemplateBlock.java b/src/club/wpia/gigi/output/template/TemplateBlock.java similarity index 89% rename from src/org/cacert/gigi/output/template/TemplateBlock.java rename to src/club/wpia/gigi/output/template/TemplateBlock.java index 1e3aac0c..650a07a8 100644 --- a/src/org/cacert/gigi/output/template/TemplateBlock.java +++ b/src/club/wpia/gigi/output/template/TemplateBlock.java @@ -1,10 +1,10 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.PrintWriter; import java.util.Collection; import java.util.Map; -import org.cacert.gigi.localisation.Language; +import club.wpia.gigi.localisation.Language; class TemplateBlock implements Translatable { diff --git a/src/org/cacert/gigi/output/template/TemplateParseException.java b/src/club/wpia/gigi/output/template/TemplateParseException.java similarity index 98% rename from src/org/cacert/gigi/output/template/TemplateParseException.java rename to src/club/wpia/gigi/output/template/TemplateParseException.java index e52f1146..3e700351 100644 --- a/src/org/cacert/gigi/output/template/TemplateParseException.java +++ b/src/club/wpia/gigi/output/template/TemplateParseException.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.IOException; import java.util.Set; diff --git a/src/org/cacert/gigi/output/template/Translatable.java b/src/club/wpia/gigi/output/template/Translatable.java similarity index 91% rename from src/org/cacert/gigi/output/template/Translatable.java rename to src/club/wpia/gigi/output/template/Translatable.java index 4df11474..c074fafc 100644 --- a/src/org/cacert/gigi/output/template/Translatable.java +++ b/src/club/wpia/gigi/output/template/Translatable.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.util.Collection; diff --git a/src/org/cacert/gigi/output/template/TranslateCommand.java b/src/club/wpia/gigi/output/template/TranslateCommand.java similarity index 90% rename from src/org/cacert/gigi/output/template/TranslateCommand.java rename to src/club/wpia/gigi/output/template/TranslateCommand.java index 7bb60112..44994286 100644 --- a/src/org/cacert/gigi/output/template/TranslateCommand.java +++ b/src/club/wpia/gigi/output/template/TranslateCommand.java @@ -1,12 +1,12 @@ -package org.cacert.gigi.output.template; +package club.wpia.gigi.output.template; import java.io.PrintWriter; import java.io.Serializable; import java.util.Collection; import java.util.Map; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.util.HTMLEncoder; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.util.HTMLEncoder; /** * Wraps a String that needs to be translated before it is printed to the user. diff --git a/src/org/cacert/gigi/pages/AboutPage.java b/src/club/wpia/gigi/pages/AboutPage.java similarity index 81% rename from src/org/cacert/gigi/pages/AboutPage.java rename to src/club/wpia/gigi/pages/AboutPage.java index a4b1d897..2b6c2c00 100644 --- a/src/org/cacert/gigi/pages/AboutPage.java +++ b/src/club/wpia/gigi/pages/AboutPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; import java.io.PrintWriter; @@ -7,7 +7,7 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.AuthorizationContext; public class AboutPage extends Page { @@ -19,7 +19,7 @@ public class AboutPage extends Page { public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { PrintWriter out = resp.getWriter(); HashMap o = new HashMap<>(); - String version = Package.getPackage("org.cacert.gigi").getImplementationVersion(); + String version = Package.getPackage("club.wpia.gigi").getImplementationVersion(); if (version == null) { version = "development"; } diff --git a/src/org/cacert/gigi/pages/AboutPage.templ b/src/club/wpia/gigi/pages/AboutPage.templ similarity index 100% rename from src/org/cacert/gigi/pages/AboutPage.templ rename to src/club/wpia/gigi/pages/AboutPage.templ diff --git a/src/org/cacert/gigi/pages/HandlesMixedRequest.java b/src/club/wpia/gigi/pages/HandlesMixedRequest.java similarity index 89% rename from src/org/cacert/gigi/pages/HandlesMixedRequest.java rename to src/club/wpia/gigi/pages/HandlesMixedRequest.java index 5e15d384..293ac6ee 100644 --- a/src/org/cacert/gigi/pages/HandlesMixedRequest.java +++ b/src/club/wpia/gigi/pages/HandlesMixedRequest.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import javax.servlet.http.HttpServletRequest; diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/club/wpia/gigi/pages/LoginPage.java similarity index 89% rename from src/org/cacert/gigi/pages/LoginPage.java rename to src/club/wpia/gigi/pages/LoginPage.java index 29b33aa4..2af51cf7 100644 --- a/src/org/cacert/gigi/pages/LoginPage.java +++ b/src/club/wpia/gigi/pages/LoginPage.java @@ -1,6 +1,6 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; -import static org.cacert.gigi.Gigi.*; +import static club.wpia.gigi.Gigi.*; import java.io.IOException; import java.io.PrintWriter; @@ -12,21 +12,21 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.TranslateCommand; -import org.cacert.gigi.pages.main.RegisterPage; -import org.cacert.gigi.util.AuthorizationContext; -import org.cacert.gigi.util.PasswordHash; -import org.cacert.gigi.util.RateLimit; -import org.cacert.gigi.util.RateLimit.RateLimitException; -import org.cacert.gigi.util.ServerConstants; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.TranslateCommand; +import club.wpia.gigi.pages.main.RegisterPage; +import club.wpia.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.PasswordHash; +import club.wpia.gigi.util.RateLimit; +import club.wpia.gigi.util.ServerConstants; +import club.wpia.gigi.util.RateLimit.RateLimitException; public class LoginPage extends Page { diff --git a/src/org/cacert/gigi/pages/LoginPage.templ b/src/club/wpia/gigi/pages/LoginPage.templ similarity index 100% rename from src/org/cacert/gigi/pages/LoginPage.templ rename to src/club/wpia/gigi/pages/LoginPage.templ diff --git a/src/org/cacert/gigi/pages/LogoutPage.java b/src/club/wpia/gigi/pages/LogoutPage.java similarity index 88% rename from src/org/cacert/gigi/pages/LogoutPage.java rename to src/club/wpia/gigi/pages/LogoutPage.java index 6f568f12..62379e72 100644 --- a/src/org/cacert/gigi/pages/LogoutPage.java +++ b/src/club/wpia/gigi/pages/LogoutPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; @@ -6,8 +6,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.cacert.gigi.Gigi; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.Gigi; +import club.wpia.gigi.util.AuthorizationContext; public class LogoutPage extends Page { diff --git a/src/org/cacert/gigi/pages/MainPage.java b/src/club/wpia/gigi/pages/MainPage.java similarity index 91% rename from src/org/cacert/gigi/pages/MainPage.java rename to src/club/wpia/gigi/pages/MainPage.java index 0cccbfb5..f797a193 100644 --- a/src/org/cacert/gigi/pages/MainPage.java +++ b/src/club/wpia/gigi/pages/MainPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; import java.util.HashMap; @@ -6,7 +6,7 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.output.template.Template; public class MainPage extends Page { diff --git a/src/org/cacert/gigi/pages/MainPage.templ b/src/club/wpia/gigi/pages/MainPage.templ similarity index 100% rename from src/org/cacert/gigi/pages/MainPage.templ rename to src/club/wpia/gigi/pages/MainPage.templ diff --git a/src/org/cacert/gigi/pages/MainPageNotLogin.templ b/src/club/wpia/gigi/pages/MainPageNotLogin.templ similarity index 100% rename from src/org/cacert/gigi/pages/MainPageNotLogin.templ rename to src/club/wpia/gigi/pages/MainPageNotLogin.templ diff --git a/src/org/cacert/gigi/pages/ManagedFormPage.java b/src/club/wpia/gigi/pages/ManagedFormPage.java similarity index 91% rename from src/org/cacert/gigi/pages/ManagedFormPage.java rename to src/club/wpia/gigi/pages/ManagedFormPage.java index eabc9027..b1cd6977 100644 --- a/src/org/cacert/gigi/pages/ManagedFormPage.java +++ b/src/club/wpia/gigi/pages/ManagedFormPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; import java.util.HashMap; @@ -6,7 +6,7 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.output.template.Form; +import club.wpia.gigi.output.template.Form; public abstract class ManagedFormPage extends Page { diff --git a/src/org/cacert/gigi/pages/ManagedMultiFormPage.java b/src/club/wpia/gigi/pages/ManagedMultiFormPage.java similarity index 86% rename from src/org/cacert/gigi/pages/ManagedMultiFormPage.java rename to src/club/wpia/gigi/pages/ManagedMultiFormPage.java index 938a7f75..eca378fe 100644 --- a/src/org/cacert/gigi/pages/ManagedMultiFormPage.java +++ b/src/club/wpia/gigi/pages/ManagedMultiFormPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; import java.util.HashMap; @@ -6,8 +6,8 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Form.CSRFException; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Form.CSRFException; public abstract class ManagedMultiFormPage extends Page { diff --git a/src/org/cacert/gigi/pages/OneFormPage.java b/src/club/wpia/gigi/pages/OneFormPage.java similarity index 91% rename from src/org/cacert/gigi/pages/OneFormPage.java rename to src/club/wpia/gigi/pages/OneFormPage.java index 512dad49..a36c9eb6 100644 --- a/src/org/cacert/gigi/pages/OneFormPage.java +++ b/src/club/wpia/gigi/pages/OneFormPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; import java.util.HashMap; @@ -6,8 +6,8 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.output.template.Form; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.output.template.Form; public class OneFormPage extends Page { diff --git a/src/org/cacert/gigi/pages/Page.java b/src/club/wpia/gigi/pages/Page.java similarity index 95% rename from src/org/cacert/gigi/pages/Page.java rename to src/club/wpia/gigi/pages/Page.java index 054a1e52..97cd83f7 100644 --- a/src/org/cacert/gigi/pages/Page.java +++ b/src/club/wpia/gigi/pages/Page.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; import java.net.URL; @@ -10,11 +10,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.cacert.gigi.PermissionCheckable; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.PermissionCheckable; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.util.AuthorizationContext; /** * This class encapsulates a sub page of Gigi. A template residing nearby this diff --git a/src/org/cacert/gigi/pages/PasswordResetForm.templ b/src/club/wpia/gigi/pages/PasswordResetForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/PasswordResetForm.templ rename to src/club/wpia/gigi/pages/PasswordResetForm.templ diff --git a/src/org/cacert/gigi/pages/PasswordResetMail.templ b/src/club/wpia/gigi/pages/PasswordResetMail.templ similarity index 100% rename from src/org/cacert/gigi/pages/PasswordResetMail.templ rename to src/club/wpia/gigi/pages/PasswordResetMail.templ diff --git a/src/org/cacert/gigi/pages/PasswordResetPage.java b/src/club/wpia/gigi/pages/PasswordResetPage.java similarity index 89% rename from src/org/cacert/gigi/pages/PasswordResetPage.java rename to src/club/wpia/gigi/pages/PasswordResetPage.java index 20b372d8..7dc950ca 100644 --- a/src/org/cacert/gigi/pages/PasswordResetPage.java +++ b/src/club/wpia/gigi/pages/PasswordResetPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; import java.io.PrintWriter; @@ -9,17 +9,17 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.MailTemplate; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.output.template.TranslateCommand; -import org.cacert.gigi.util.AuthorizationContext; -import org.cacert.gigi.util.RandomToken; -import org.cacert.gigi.util.ServerConstants; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.MailTemplate; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.output.template.TranslateCommand; +import club.wpia.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.RandomToken; +import club.wpia.gigi.util.ServerConstants; public class PasswordResetPage extends Page { diff --git a/src/org/cacert/gigi/pages/PolicyIndex.java b/src/club/wpia/gigi/pages/PolicyIndex.java similarity index 97% rename from src/org/cacert/gigi/pages/PolicyIndex.java rename to src/club/wpia/gigi/pages/PolicyIndex.java index 30c58856..9db02dfa 100644 --- a/src/org/cacert/gigi/pages/PolicyIndex.java +++ b/src/club/wpia/gigi/pages/PolicyIndex.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.File; import java.io.IOException; diff --git a/src/org/cacert/gigi/pages/RootCertPage.java b/src/club/wpia/gigi/pages/RootCertPage.java similarity index 96% rename from src/org/cacert/gigi/pages/RootCertPage.java rename to src/club/wpia/gigi/pages/RootCertPage.java index d714af91..c821e7c4 100644 --- a/src/org/cacert/gigi/pages/RootCertPage.java +++ b/src/club/wpia/gigi/pages/RootCertPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; import java.security.KeyStore; @@ -11,7 +11,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.util.PEM; +import club.wpia.gigi.util.PEM; public class RootCertPage extends Page { diff --git a/src/org/cacert/gigi/pages/RootCertPage.templ b/src/club/wpia/gigi/pages/RootCertPage.templ similarity index 100% rename from src/org/cacert/gigi/pages/RootCertPage.templ rename to src/club/wpia/gigi/pages/RootCertPage.templ diff --git a/src/org/cacert/gigi/pages/StaticPage.java b/src/club/wpia/gigi/pages/StaticPage.java similarity index 90% rename from src/org/cacert/gigi/pages/StaticPage.java rename to src/club/wpia/gigi/pages/StaticPage.java index be2e75bd..b07004af 100644 --- a/src/org/cacert/gigi/pages/StaticPage.java +++ b/src/club/wpia/gigi/pages/StaticPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; import java.io.InputStream; @@ -9,7 +9,7 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.output.template.Template; public class StaticPage extends Page { diff --git a/src/org/cacert/gigi/pages/TestSecure.java b/src/club/wpia/gigi/pages/TestSecure.java similarity index 95% rename from src/org/cacert/gigi/pages/TestSecure.java rename to src/club/wpia/gigi/pages/TestSecure.java index 7a3b76e3..22790fe0 100644 --- a/src/org/cacert/gigi/pages/TestSecure.java +++ b/src/club/wpia/gigi/pages/TestSecure.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; diff --git a/src/org/cacert/gigi/pages/Verify.java b/src/club/wpia/gigi/pages/Verify.java similarity index 91% rename from src/org/cacert/gigi/pages/Verify.java rename to src/club/wpia/gigi/pages/Verify.java index bc463981..930b5efb 100644 --- a/src/org/cacert/gigi/pages/Verify.java +++ b/src/club/wpia/gigi/pages/Verify.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; import java.io.PrintWriter; @@ -9,14 +9,14 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.Verifyable; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Scope; -import org.cacert.gigi.output.template.SprintfCommand; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.Verifyable; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Scope; +import club.wpia.gigi.output.template.SprintfCommand; public class Verify extends Page { diff --git a/src/org/cacert/gigi/pages/Verify.templ b/src/club/wpia/gigi/pages/Verify.templ similarity index 100% rename from src/org/cacert/gigi/pages/Verify.templ rename to src/club/wpia/gigi/pages/Verify.templ diff --git a/src/org/cacert/gigi/pages/account/ChangeForm.java b/src/club/wpia/gigi/pages/account/ChangeForm.java similarity index 81% rename from src/org/cacert/gigi/pages/account/ChangeForm.java rename to src/club/wpia/gigi/pages/account/ChangeForm.java index 086c8a85..53c04de6 100644 --- a/src/org/cacert/gigi/pages/account/ChangeForm.java +++ b/src/club/wpia/gigi/pages/account/ChangeForm.java @@ -1,16 +1,16 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.output.template.TranslateCommand; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.output.template.TranslateCommand; public class ChangeForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ b/src/club/wpia/gigi/pages/account/ChangePasswordForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/ChangePasswordForm.templ rename to src/club/wpia/gigi/pages/account/ChangePasswordForm.templ diff --git a/src/org/cacert/gigi/pages/account/ChangePasswordPage.java b/src/club/wpia/gigi/pages/account/ChangePasswordPage.java similarity index 80% rename from src/org/cacert/gigi/pages/account/ChangePasswordPage.java rename to src/club/wpia/gigi/pages/account/ChangePasswordPage.java index 60cfaa0b..43823002 100644 --- a/src/org/cacert/gigi/pages/account/ChangePasswordPage.java +++ b/src/club/wpia/gigi/pages/account/ChangePasswordPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import java.io.IOException; import java.util.HashMap; @@ -6,9 +6,9 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.ManagedFormPage; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.ManagedFormPage; +import club.wpia.gigi.util.AuthorizationContext; public class ChangePasswordPage extends ManagedFormPage { diff --git a/src/org/cacert/gigi/pages/account/FindAgentAccess.java b/src/club/wpia/gigi/pages/account/FindAgentAccess.java similarity index 79% rename from src/org/cacert/gigi/pages/account/FindAgentAccess.java rename to src/club/wpia/gigi/pages/account/FindAgentAccess.java index 47735f32..77d9aa69 100644 --- a/src/org/cacert/gigi/pages/account/FindAgentAccess.java +++ b/src/club/wpia/gigi/pages/account/FindAgentAccess.java @@ -1,17 +1,17 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.LoginPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.LoginPage; public class FindAgentAccess extends Form { diff --git a/src/org/cacert/gigi/pages/account/FindAgentAccess.templ b/src/club/wpia/gigi/pages/account/FindAgentAccess.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/FindAgentAccess.templ rename to src/club/wpia/gigi/pages/account/FindAgentAccess.templ diff --git a/src/org/cacert/gigi/pages/account/History.java b/src/club/wpia/gigi/pages/account/History.java similarity index 87% rename from src/org/cacert/gigi/pages/account/History.java rename to src/club/wpia/gigi/pages/account/History.java index 470ed1c6..7c77cf30 100644 --- a/src/org/cacert/gigi/pages/account/History.java +++ b/src/club/wpia/gigi/pages/account/History.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import java.io.IOException; import java.util.HashMap; @@ -6,10 +6,10 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.output.template.OutputableArrayIterable; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.output.template.OutputableArrayIterable; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; public class History extends Page { diff --git a/src/org/cacert/gigi/pages/account/History.templ b/src/club/wpia/gigi/pages/account/History.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/History.templ rename to src/club/wpia/gigi/pages/account/History.templ diff --git a/src/org/cacert/gigi/pages/account/MyDetails.java b/src/club/wpia/gigi/pages/account/MyDetails.java similarity index 93% rename from src/org/cacert/gigi/pages/account/MyDetails.java rename to src/club/wpia/gigi/pages/account/MyDetails.java index e6ba3ead..12d127fa 100644 --- a/src/org/cacert/gigi/pages/account/MyDetails.java +++ b/src/club/wpia/gigi/pages/account/MyDetails.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import java.io.IOException; import java.io.PrintWriter; @@ -7,9 +7,9 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.Page; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.Page; public class MyDetails extends Page { diff --git a/src/org/cacert/gigi/pages/account/MyDetails.templ b/src/club/wpia/gigi/pages/account/MyDetails.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/MyDetails.templ rename to src/club/wpia/gigi/pages/account/MyDetails.templ diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/club/wpia/gigi/pages/account/MyDetailsForm.java similarity index 90% rename from src/org/cacert/gigi/pages/account/MyDetailsForm.java rename to src/club/wpia/gigi/pages/account/MyDetailsForm.java index f5b6f514..4af7c94a 100644 --- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java +++ b/src/club/wpia/gigi/pages/account/MyDetailsForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import java.io.PrintWriter; import java.util.Map; @@ -6,19 +6,19 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.ArrayIterable; -import org.cacert.gigi.output.CountrySelector; -import org.cacert.gigi.output.DateSelector; -import org.cacert.gigi.output.GroupIterator; -import org.cacert.gigi.output.GroupSelector; -import org.cacert.gigi.output.NameInput; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.ArrayIterable; +import club.wpia.gigi.output.CountrySelector; +import club.wpia.gigi.output.DateSelector; +import club.wpia.gigi.output.GroupIterator; +import club.wpia.gigi.output.GroupSelector; +import club.wpia.gigi.output.NameInput; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Template; public class MyDetailsForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.templ b/src/club/wpia/gigi/pages/account/MyDetailsForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/MyDetailsForm.templ rename to src/club/wpia/gigi/pages/account/MyDetailsForm.templ diff --git a/src/org/cacert/gigi/pages/account/MyDetailsFormAssured.templ b/src/club/wpia/gigi/pages/account/MyDetailsFormAssured.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/MyDetailsFormAssured.templ rename to src/club/wpia/gigi/pages/account/MyDetailsFormAssured.templ diff --git a/src/org/cacert/gigi/pages/account/MyDetailsRoles.templ b/src/club/wpia/gigi/pages/account/MyDetailsRoles.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/MyDetailsRoles.templ rename to src/club/wpia/gigi/pages/account/MyDetailsRoles.templ diff --git a/src/org/cacert/gigi/pages/account/MyOrganisationsForm.java b/src/club/wpia/gigi/pages/account/MyOrganisationsForm.java similarity index 85% rename from src/org/cacert/gigi/pages/account/MyOrganisationsForm.java rename to src/club/wpia/gigi/pages/account/MyOrganisationsForm.java index aaa84173..835973a1 100644 --- a/src/org/cacert/gigi/pages/account/MyOrganisationsForm.java +++ b/src/club/wpia/gigi/pages/account/MyOrganisationsForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import java.io.PrintWriter; import java.util.Enumeration; @@ -8,15 +8,15 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.Gigi; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.Gigi; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.util.AuthorizationContext; public class MyOrganisationsForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/MyOrganisationsForm.templ b/src/club/wpia/gigi/pages/account/MyOrganisationsForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/MyOrganisationsForm.templ rename to src/club/wpia/gigi/pages/account/MyOrganisationsForm.templ diff --git a/src/org/cacert/gigi/pages/account/NamesForm.templ b/src/club/wpia/gigi/pages/account/NamesForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/NamesForm.templ rename to src/club/wpia/gigi/pages/account/NamesForm.templ diff --git a/src/org/cacert/gigi/pages/account/UserTrainings.java b/src/club/wpia/gigi/pages/account/UserTrainings.java similarity index 87% rename from src/org/cacert/gigi/pages/account/UserTrainings.java rename to src/club/wpia/gigi/pages/account/UserTrainings.java index fca2d24f..1a04e85e 100644 --- a/src/org/cacert/gigi/pages/account/UserTrainings.java +++ b/src/club/wpia/gigi/pages/account/UserTrainings.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import java.io.IOException; import java.util.HashMap; @@ -6,10 +6,10 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.output.template.OutputableArrayIterable; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.output.template.OutputableArrayIterable; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; public class UserTrainings extends Page { diff --git a/src/org/cacert/gigi/pages/account/UserTrainings.templ b/src/club/wpia/gigi/pages/account/UserTrainings.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/UserTrainings.templ rename to src/club/wpia/gigi/pages/account/UserTrainings.templ diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java b/src/club/wpia/gigi/pages/account/certs/CertificateAdd.java similarity index 80% rename from src/org/cacert/gigi/pages/account/certs/CertificateAdd.java rename to src/club/wpia/gigi/pages/account/certs/CertificateAdd.java index b61ec3ec..9694531c 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java +++ b/src/club/wpia/gigi/pages/account/certs/CertificateAdd.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account.certs; +package club.wpia.gigi.pages.account.certs; import java.io.IOException; import java.util.HashMap; @@ -6,9 +6,9 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.pages.ManagedFormPage; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.pages.ManagedFormPage; +import club.wpia.gigi.util.AuthorizationContext; public class CertificateAdd extends ManagedFormPage { diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ b/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ rename to src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java b/src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.java similarity index 87% rename from src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java rename to src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.java index 3e2d8052..cfeeaddd 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java +++ b/src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account.certs; +package club.wpia.gigi.pages.account.certs; import java.io.IOException; import java.io.PrintWriter; @@ -8,26 +8,26 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.CertificateValiditySelector; -import org.cacert.gigi.output.HashAlgorithms; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.util.AuthorizationContext; -import org.cacert.gigi.util.HTMLEncoder; -import org.cacert.gigi.util.RandomToken; -import org.cacert.gigi.util.ServerConstants; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.dbObjects.Certificate.SubjectAlternateName; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.CertificateValiditySelector; +import club.wpia.gigi.output.HashAlgorithms; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.HTMLEncoder; +import club.wpia.gigi.util.RandomToken; +import club.wpia.gigi.util.ServerConstants; /** * This class represents a form that is used for issuing certificates. This diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ rename to src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.templ diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java b/src/club/wpia/gigi/pages/account/certs/CertificateModificationForm.java similarity index 84% rename from src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java rename to src/club/wpia/gigi/pages/account/certs/CertificateModificationForm.java index 7c3f7840..567f4cb3 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java +++ b/src/club/wpia/gigi/pages/account/certs/CertificateModificationForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account.certs; +package club.wpia.gigi.pages.account.certs; import java.io.PrintWriter; import java.util.LinkedList; @@ -6,15 +6,15 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Job; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.CertificateIterable; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.LoginPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Job; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.CertificateIterable; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.LoginPage; public class CertificateModificationForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.templ b/src/club/wpia/gigi/pages/account/certs/CertificateModificationForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.templ rename to src/club/wpia/gigi/pages/account/certs/CertificateModificationForm.templ diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java b/src/club/wpia/gigi/pages/account/certs/CertificateRequest.java similarity index 96% rename from src/org/cacert/gigi/pages/account/certs/CertificateRequest.java rename to src/club/wpia/gigi/pages/account/certs/CertificateRequest.java index 5edf362e..2755b18f 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java +++ b/src/club/wpia/gigi/pages/account/certs/CertificateRequest.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account.certs; +package club.wpia.gigi.pages.account.certs; import java.io.IOException; import java.io.PrintWriter; @@ -14,26 +14,25 @@ import java.util.LinkedHashSet; import java.util.Set; import java.util.TreeSet; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.crypto.SPKAC; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.Certificate.SANType; -import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.CertificateProfile.PropertyTemplate; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.output.template.SprintfCommand; -import org.cacert.gigi.util.AuthorizationContext; -import org.cacert.gigi.util.CAA; -import org.cacert.gigi.util.DomainAssessment; -import org.cacert.gigi.util.PEM; -import org.cacert.gigi.util.RateLimit; - +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.crypto.SPKAC; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.dbObjects.Certificate.SANType; +import club.wpia.gigi.dbObjects.Certificate.SubjectAlternateName; +import club.wpia.gigi.dbObjects.CertificateProfile.PropertyTemplate; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.CAA; +import club.wpia.gigi.util.DomainAssessment; +import club.wpia.gigi.util.PEM; +import club.wpia.gigi.util.RateLimit; import sun.security.pkcs.PKCS9Attribute; import sun.security.pkcs10.PKCS10; import sun.security.pkcs10.PKCS10Attribute; diff --git a/src/org/cacert/gigi/pages/account/certs/Certificates.java b/src/club/wpia/gigi/pages/account/certs/Certificates.java similarity index 91% rename from src/org/cacert/gigi/pages/account/certs/Certificates.java rename to src/club/wpia/gigi/pages/account/certs/Certificates.java index 23cd915d..e2244e99 100644 --- a/src/org/cacert/gigi/pages/account/certs/Certificates.java +++ b/src/club/wpia/gigi/pages/account/certs/Certificates.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account.certs; +package club.wpia.gigi.pages.account.certs; import java.io.IOException; import java.io.PrintWriter; @@ -13,24 +13,24 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.SupportedUser; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.TrustchainIterable; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.HandlesMixedRequest; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; -import org.cacert.gigi.util.CertExporter; -import org.cacert.gigi.util.PEM; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.SupportedUser; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.dbObjects.Certificate.SubjectAlternateName; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.TrustchainIterable; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.HandlesMixedRequest; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.CertExporter; +import club.wpia.gigi.util.PEM; public class Certificates extends Page implements HandlesMixedRequest { diff --git a/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ b/src/club/wpia/gigi/pages/account/certs/RequestCertificate.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ rename to src/club/wpia/gigi/pages/account/certs/RequestCertificate.templ diff --git a/src/org/cacert/gigi/pages/account/certs/RevokeSingleCertForm.java b/src/club/wpia/gigi/pages/account/certs/RevokeSingleCertForm.java similarity index 74% rename from src/org/cacert/gigi/pages/account/certs/RevokeSingleCertForm.java rename to src/club/wpia/gigi/pages/account/certs/RevokeSingleCertForm.java index 372b5568..034d9577 100644 --- a/src/org/cacert/gigi/pages/account/certs/RevokeSingleCertForm.java +++ b/src/club/wpia/gigi/pages/account/certs/RevokeSingleCertForm.java @@ -1,16 +1,16 @@ -package org.cacert.gigi.pages.account.certs; +package club.wpia.gigi.pages.account.certs; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.SupportedUser; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.SupportedUser; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Template; public class RevokeSingleCertForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/certs/RevokeSingleCertForm.templ b/src/club/wpia/gigi/pages/account/certs/RevokeSingleCertForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/certs/RevokeSingleCertForm.templ rename to src/club/wpia/gigi/pages/account/certs/RevokeSingleCertForm.templ diff --git a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.java b/src/club/wpia/gigi/pages/account/domain/DomainAddForm.java similarity index 80% rename from src/org/cacert/gigi/pages/account/domain/DomainAddForm.java rename to src/club/wpia/gigi/pages/account/domain/DomainAddForm.java index 58482179..afcbba60 100644 --- a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.java +++ b/src/club/wpia/gigi/pages/account/domain/DomainAddForm.java @@ -1,17 +1,17 @@ -package org.cacert.gigi.pages.account.domain; +package club.wpia.gigi.pages.account.domain; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.Template; public class DomainAddForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ b/src/club/wpia/gigi/pages/account/domain/DomainAddForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ rename to src/club/wpia/gigi/pages/account/domain/DomainAddForm.templ diff --git a/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java b/src/club/wpia/gigi/pages/account/domain/DomainManagementForm.java similarity index 83% rename from src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java rename to src/club/wpia/gigi/pages/account/domain/DomainManagementForm.java index c6ea009f..95fce624 100644 --- a/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java +++ b/src/club/wpia/gigi/pages/account/domain/DomainManagementForm.java @@ -1,18 +1,18 @@ -package org.cacert.gigi.pages.account.domain; +package club.wpia.gigi.pages.account.domain; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.orga.ViewOrgPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.orga.ViewOrgPage; public class DomainManagementForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.templ b/src/club/wpia/gigi/pages/account/domain/DomainManagementForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/domain/DomainManagementForm.templ rename to src/club/wpia/gigi/pages/account/domain/DomainManagementForm.templ diff --git a/src/org/cacert/gigi/pages/account/domain/DomainOverview.java b/src/club/wpia/gigi/pages/account/domain/DomainOverview.java similarity index 79% rename from src/org/cacert/gigi/pages/account/domain/DomainOverview.java rename to src/club/wpia/gigi/pages/account/domain/DomainOverview.java index aa2043a1..4db4865c 100644 --- a/src/org/cacert/gigi/pages/account/domain/DomainOverview.java +++ b/src/club/wpia/gigi/pages/account/domain/DomainOverview.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account.domain; +package club.wpia.gigi.pages.account.domain; import java.io.IOException; import java.util.HashMap; @@ -6,13 +6,13 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Form.CSRFException; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.ManagedMultiFormPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Form.CSRFException; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.ManagedMultiFormPage; public class DomainOverview extends ManagedMultiFormPage { diff --git a/src/org/cacert/gigi/pages/account/domain/DomainOverview.templ b/src/club/wpia/gigi/pages/account/domain/DomainOverview.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/domain/DomainOverview.templ rename to src/club/wpia/gigi/pages/account/domain/DomainOverview.templ diff --git a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java b/src/club/wpia/gigi/pages/account/domain/DomainPinglogForm.java similarity index 83% rename from src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java rename to src/club/wpia/gigi/pages/account/domain/DomainPinglogForm.java index 54209b20..3ddde80a 100644 --- a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java +++ b/src/club/wpia/gigi/pages/account/domain/DomainPinglogForm.java @@ -1,20 +1,20 @@ -package org.cacert.gigi.pages.account.domain; +package club.wpia.gigi.pages.account.domain; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.DomainPingConfiguration; -import org.cacert.gigi.dbObjects.DomainPingExecution; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.LoginPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.DomainPingConfiguration; +import club.wpia.gigi.dbObjects.DomainPingExecution; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.LoginPage; public class DomainPinglogForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ b/src/club/wpia/gigi/pages/account/domain/DomainPinglogForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ rename to src/club/wpia/gigi/pages/account/domain/DomainPinglogForm.templ diff --git a/src/org/cacert/gigi/pages/account/domain/EditDomain.java b/src/club/wpia/gigi/pages/account/domain/EditDomain.java similarity index 83% rename from src/org/cacert/gigi/pages/account/domain/EditDomain.java rename to src/club/wpia/gigi/pages/account/domain/EditDomain.java index f7df4903..0f63676b 100644 --- a/src/org/cacert/gigi/pages/account/domain/EditDomain.java +++ b/src/club/wpia/gigi/pages/account/domain/EditDomain.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account.domain; +package club.wpia.gigi.pages.account.domain; import java.io.IOException; import java.util.HashMap; @@ -6,13 +6,13 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Form.CSRFException; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.ManagedMultiFormPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Form.CSRFException; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.ManagedMultiFormPage; public class EditDomain extends ManagedMultiFormPage { diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java b/src/club/wpia/gigi/pages/account/domain/PingConfigForm.java similarity index 92% rename from src/org/cacert/gigi/pages/account/domain/PingConfigForm.java rename to src/club/wpia/gigi/pages/account/domain/PingConfigForm.java index e212bb00..95076a0d 100644 --- a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java +++ b/src/club/wpia/gigi/pages/account/domain/PingConfigForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account.domain; +package club.wpia.gigi.pages.account.domain; import java.io.PrintWriter; import java.util.Arrays; @@ -7,18 +7,18 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.Gigi; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.DomainPingConfiguration; -import org.cacert.gigi.dbObjects.DomainPingType; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.ping.SSLPinger; -import org.cacert.gigi.util.RandomToken; -import org.cacert.gigi.util.SystemKeywords; +import club.wpia.gigi.Gigi; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.DomainPingConfiguration; +import club.wpia.gigi.dbObjects.DomainPingType; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.ping.SSLPinger; +import club.wpia.gigi.util.RandomToken; +import club.wpia.gigi.util.SystemKeywords; public class PingConfigForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ b/src/club/wpia/gigi/pages/account/domain/PingConfigForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ rename to src/club/wpia/gigi/pages/account/domain/PingConfigForm.templ diff --git a/src/org/cacert/gigi/pages/account/mail/MailAddForm.java b/src/club/wpia/gigi/pages/account/mail/MailAddForm.java similarity index 72% rename from src/org/cacert/gigi/pages/account/mail/MailAddForm.java rename to src/club/wpia/gigi/pages/account/mail/MailAddForm.java index 47cd8384..3c208409 100644 --- a/src/org/cacert/gigi/pages/account/mail/MailAddForm.java +++ b/src/club/wpia/gigi/pages/account/mail/MailAddForm.java @@ -1,18 +1,18 @@ -package org.cacert.gigi.pages.account.mail; +package club.wpia.gigi.pages.account.mail; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.PlainOutputable; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.Page; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.PlainOutputable; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.Page; public class MailAddForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ b/src/club/wpia/gigi/pages/account/mail/MailAddForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/mail/MailAddForm.templ rename to src/club/wpia/gigi/pages/account/mail/MailAddForm.templ diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java b/src/club/wpia/gigi/pages/account/mail/MailManagementForm.java similarity index 87% rename from src/org/cacert/gigi/pages/account/mail/MailManagementForm.java rename to src/club/wpia/gigi/pages/account/mail/MailManagementForm.java index 5d0ce7ec..d23260a2 100644 --- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java +++ b/src/club/wpia/gigi/pages/account/mail/MailManagementForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account.mail; +package club.wpia.gigi.pages.account.mail; import java.io.IOException; import java.io.PrintWriter; @@ -6,15 +6,15 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.TimeConditions; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.TimeConditions; public class MailManagementForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ b/src/club/wpia/gigi/pages/account/mail/MailManagementForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ rename to src/club/wpia/gigi/pages/account/mail/MailManagementForm.templ diff --git a/src/org/cacert/gigi/pages/account/mail/MailOverview.java b/src/club/wpia/gigi/pages/account/mail/MailOverview.java similarity index 84% rename from src/org/cacert/gigi/pages/account/mail/MailOverview.java rename to src/club/wpia/gigi/pages/account/mail/MailOverview.java index ef98a091..28df649c 100644 --- a/src/org/cacert/gigi/pages/account/mail/MailOverview.java +++ b/src/club/wpia/gigi/pages/account/mail/MailOverview.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account.mail; +package club.wpia.gigi.pages.account.mail; import java.io.IOException; import java.util.HashMap; @@ -6,13 +6,13 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Form.CSRFException; -import org.cacert.gigi.pages.ManagedMultiFormPage; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Form.CSRFException; +import club.wpia.gigi.pages.ManagedMultiFormPage; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; public class MailOverview extends ManagedMultiFormPage { diff --git a/src/org/cacert/gigi/pages/account/mail/MailOverview.templ b/src/club/wpia/gigi/pages/account/mail/MailOverview.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/mail/MailOverview.templ rename to src/club/wpia/gigi/pages/account/mail/MailOverview.templ diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java b/src/club/wpia/gigi/pages/admin/TTPAdminForm.java similarity index 77% rename from src/org/cacert/gigi/pages/admin/TTPAdminForm.java rename to src/club/wpia/gigi/pages/admin/TTPAdminForm.java index 2f3ee842..01b7f348 100644 --- a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java +++ b/src/club/wpia/gigi/pages/admin/TTPAdminForm.java @@ -1,16 +1,16 @@ -package org.cacert.gigi.pages.admin; +package club.wpia.gigi.pages.admin; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.LoginPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.LoginPage; public class TTPAdminForm extends Form { diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminForm.templ b/src/club/wpia/gigi/pages/admin/TTPAdminForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/TTPAdminForm.templ rename to src/club/wpia/gigi/pages/admin/TTPAdminForm.templ diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java b/src/club/wpia/gigi/pages/admin/TTPAdminPage.java similarity index 87% rename from src/org/cacert/gigi/pages/admin/TTPAdminPage.java rename to src/club/wpia/gigi/pages/admin/TTPAdminPage.java index 286a08d5..d3c1c590 100644 --- a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java +++ b/src/club/wpia/gigi/pages/admin/TTPAdminPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin; +package club.wpia.gigi.pages.admin; import java.io.IOException; import java.util.Arrays; @@ -8,15 +8,15 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.SprintfCommand; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.pages.error.PageNotFound; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.pages.error.PageNotFound; +import club.wpia.gigi.util.AuthorizationContext; public class TTPAdminPage extends Page { diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminPage.templ b/src/club/wpia/gigi/pages/admin/TTPAdminPage.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/TTPAdminPage.templ rename to src/club/wpia/gigi/pages/admin/TTPAdminPage.templ diff --git a/src/org/cacert/gigi/pages/admin/support/FindCertForm.java b/src/club/wpia/gigi/pages/admin/support/FindCertForm.java similarity index 86% rename from src/org/cacert/gigi/pages/admin/support/FindCertForm.java rename to src/club/wpia/gigi/pages/admin/support/FindCertForm.java index 207a2a8a..1c3d0ce7 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindCertForm.java +++ b/src/club/wpia/gigi/pages/admin/support/FindCertForm.java @@ -1,17 +1,17 @@ -package org.cacert.gigi.pages.admin.support; +package club.wpia.gigi.pages.admin.support; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.SANType; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.SprintfCommand; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.Certificate.SANType; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.output.template.Template; public class FindCertForm extends Form { diff --git a/src/org/cacert/gigi/pages/admin/support/FindCertForm.templ b/src/club/wpia/gigi/pages/admin/support/FindCertForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/support/FindCertForm.templ rename to src/club/wpia/gigi/pages/admin/support/FindCertForm.templ diff --git a/src/org/cacert/gigi/pages/admin/support/FindCertPage.java b/src/club/wpia/gigi/pages/admin/support/FindCertPage.java similarity index 83% rename from src/org/cacert/gigi/pages/admin/support/FindCertPage.java rename to src/club/wpia/gigi/pages/admin/support/FindCertPage.java index e7f6b95e..0d2edbc9 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindCertPage.java +++ b/src/club/wpia/gigi/pages/admin/support/FindCertPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin.support; +package club.wpia.gigi.pages.admin.support; import java.io.IOException; import java.util.HashMap; @@ -8,17 +8,17 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.ArrayIterable; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.SprintfCommand; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.pages.account.certs.Certificates; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.Certificate.SubjectAlternateName; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.ArrayIterable; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.pages.account.certs.Certificates; +import club.wpia.gigi.util.AuthorizationContext; public class FindCertPage extends Page { diff --git a/src/org/cacert/gigi/pages/admin/support/FindCertPage.templ b/src/club/wpia/gigi/pages/admin/support/FindCertPage.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/support/FindCertPage.templ rename to src/club/wpia/gigi/pages/admin/support/FindCertPage.templ diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.java b/src/club/wpia/gigi/pages/admin/support/FindUserByDomainForm.java similarity index 82% rename from src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.java rename to src/club/wpia/gigi/pages/admin/support/FindUserByDomainForm.java index 9aae4470..75c8c590 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.java +++ b/src/club/wpia/gigi/pages/admin/support/FindUserByDomainForm.java @@ -1,19 +1,19 @@ -package org.cacert.gigi.pages.admin.support; +package club.wpia.gigi.pages.admin.support; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.SprintfCommand; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.output.template.Template; public class FindUserByDomainForm extends Form { diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ b/src/club/wpia/gigi/pages/admin/support/FindUserByDomainForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ rename to src/club/wpia/gigi/pages/admin/support/FindUserByDomainForm.templ diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByDomainPage.java b/src/club/wpia/gigi/pages/admin/support/FindUserByDomainPage.java similarity index 80% rename from src/org/cacert/gigi/pages/admin/support/FindUserByDomainPage.java rename to src/club/wpia/gigi/pages/admin/support/FindUserByDomainPage.java index 8a642180..380ca284 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindUserByDomainPage.java +++ b/src/club/wpia/gigi/pages/admin/support/FindUserByDomainPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin.support; +package club.wpia.gigi.pages.admin.support; import java.io.IOException; import java.util.HashMap; @@ -6,9 +6,9 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.pages.ManagedFormPage; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.pages.ManagedFormPage; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; public class FindUserByDomainPage extends ManagedFormPage { diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.java b/src/club/wpia/gigi/pages/admin/support/FindUserByEmailForm.java similarity index 79% rename from src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.java rename to src/club/wpia/gigi/pages/admin/support/FindUserByEmailForm.java index 2978c48e..c1cc44ce 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.java +++ b/src/club/wpia/gigi/pages/admin/support/FindUserByEmailForm.java @@ -1,16 +1,16 @@ -package org.cacert.gigi.pages.admin.support; +package club.wpia.gigi.pages.admin.support; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.SprintfCommand; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.output.template.Template; public class FindUserByEmailForm extends Form { diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ b/src/club/wpia/gigi/pages/admin/support/FindUserByEmailForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ rename to src/club/wpia/gigi/pages/admin/support/FindUserByEmailForm.templ diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java b/src/club/wpia/gigi/pages/admin/support/FindUserByEmailPage.java similarity index 86% rename from src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java rename to src/club/wpia/gigi/pages/admin/support/FindUserByEmailPage.java index 9d731712..bf669267 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java +++ b/src/club/wpia/gigi/pages/admin/support/FindUserByEmailPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin.support; +package club.wpia.gigi.pages.admin.support; import java.io.IOException; import java.util.HashMap; @@ -7,13 +7,13 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; public class FindUserByEmailPage extends Page { diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailUsertable.templ b/src/club/wpia/gigi/pages/admin/support/FindUserByEmailUsertable.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/support/FindUserByEmailUsertable.templ rename to src/club/wpia/gigi/pages/admin/support/FindUserByEmailUsertable.templ diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java b/src/club/wpia/gigi/pages/admin/support/SupportEnterTicketForm.java similarity index 82% rename from src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java rename to src/club/wpia/gigi/pages/admin/support/SupportEnterTicketForm.java index e2e30a93..0a98dfd1 100644 --- a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java +++ b/src/club/wpia/gigi/pages/admin/support/SupportEnterTicketForm.java @@ -1,17 +1,17 @@ -package org.cacert.gigi.pages.admin.support; +package club.wpia.gigi.pages.admin.support; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.Gigi; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.Gigi; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.util.AuthorizationContext; public class SupportEnterTicketForm extends Form { diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ b/src/club/wpia/gigi/pages/admin/support/SupportEnterTicketForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ rename to src/club/wpia/gigi/pages/admin/support/SupportEnterTicketForm.templ diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketPage.java b/src/club/wpia/gigi/pages/admin/support/SupportEnterTicketPage.java similarity index 86% rename from src/org/cacert/gigi/pages/admin/support/SupportEnterTicketPage.java rename to src/club/wpia/gigi/pages/admin/support/SupportEnterTicketPage.java index 01cc695f..24f093a4 100644 --- a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketPage.java +++ b/src/club/wpia/gigi/pages/admin/support/SupportEnterTicketPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin.support; +package club.wpia.gigi.pages.admin.support; import java.io.IOException; import java.util.HashMap; @@ -6,11 +6,11 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; public class SupportEnterTicketPage extends Page { diff --git a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java b/src/club/wpia/gigi/pages/admin/support/SupportRevokeCertificatesForm.java similarity index 86% rename from src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java rename to src/club/wpia/gigi/pages/admin/support/SupportRevokeCertificatesForm.java index 5b163cc4..f3d725c1 100644 --- a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java +++ b/src/club/wpia/gigi/pages/admin/support/SupportRevokeCertificatesForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin.support; +package club.wpia.gigi.pages.admin.support; import java.io.IOException; import java.io.PrintWriter; @@ -8,15 +8,15 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.SupportedUser; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.SupportedUser; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Template; public class SupportRevokeCertificatesForm extends Form { diff --git a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ b/src/club/wpia/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ rename to src/club/wpia/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.java similarity index 84% rename from src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java rename to src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.java index 88b9b03b..7439ae67 100644 --- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java +++ b/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin.support; +package club.wpia.gigi.pages.admin.support; import java.io.PrintWriter; import java.util.Map; @@ -6,20 +6,20 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.dbObjects.SupportedUser; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.ArrayIterable; -import org.cacert.gigi.output.DateSelector; -import org.cacert.gigi.output.GroupIterator; -import org.cacert.gigi.output.GroupSelector; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.output.template.TranslateCommand; -import org.cacert.gigi.pages.LoginPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.SupportedUser; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.ArrayIterable; +import club.wpia.gigi.output.DateSelector; +import club.wpia.gigi.output.GroupIterator; +import club.wpia.gigi.output.GroupSelector; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.output.template.TranslateCommand; +import club.wpia.gigi.pages.LoginPage; public class SupportUserDetailsForm extends Form { diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ b/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ rename to src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.templ diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsPage.java similarity index 89% rename from src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java rename to src/club/wpia/gigi/pages/admin/support/SupportUserDetailsPage.java index eea69f6d..6831b8b3 100644 --- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java +++ b/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin.support; +package club.wpia.gigi.pages.admin.support; import java.io.IOException; import java.util.HashMap; @@ -7,17 +7,17 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.SupportedUser; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Form.CSRFException; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.ManagedMultiFormPage; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.SupportedUser; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Form.CSRFException; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.ManagedMultiFormPage; +import club.wpia.gigi.util.AuthorizationContext; public class SupportUserDetailsPage extends ManagedMultiFormPage { diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ b/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsPage.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ rename to src/club/wpia/gigi/pages/admin/support/SupportUserDetailsPage.templ diff --git a/src/org/cacert/gigi/pages/error/AccessDenied.java b/src/club/wpia/gigi/pages/error/AccessDenied.java similarity index 88% rename from src/org/cacert/gigi/pages/error/AccessDenied.java rename to src/club/wpia/gigi/pages/error/AccessDenied.java index 4908c75a..5cf9d865 100644 --- a/src/org/cacert/gigi/pages/error/AccessDenied.java +++ b/src/club/wpia/gigi/pages/error/AccessDenied.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.error; +package club.wpia.gigi.pages.error; import java.io.IOException; import java.util.Collections; @@ -6,7 +6,7 @@ import java.util.Collections; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.pages.Page; +import club.wpia.gigi.pages.Page; public class AccessDenied extends Page { diff --git a/src/org/cacert/gigi/pages/error/AccessDenied.templ b/src/club/wpia/gigi/pages/error/AccessDenied.templ similarity index 100% rename from src/org/cacert/gigi/pages/error/AccessDenied.templ rename to src/club/wpia/gigi/pages/error/AccessDenied.templ diff --git a/src/org/cacert/gigi/pages/error/PageNotFound.java b/src/club/wpia/gigi/pages/error/PageNotFound.java similarity index 93% rename from src/org/cacert/gigi/pages/error/PageNotFound.java rename to src/club/wpia/gigi/pages/error/PageNotFound.java index ffc107f5..6031a736 100644 --- a/src/org/cacert/gigi/pages/error/PageNotFound.java +++ b/src/club/wpia/gigi/pages/error/PageNotFound.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.error; +package club.wpia.gigi.pages.error; import java.io.IOException; import java.util.HashMap; @@ -6,7 +6,7 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.pages.Page; +import club.wpia.gigi.pages.Page; public class PageNotFound extends Page { diff --git a/src/org/cacert/gigi/pages/error/PageNotFound.templ b/src/club/wpia/gigi/pages/error/PageNotFound.templ similarity index 100% rename from src/org/cacert/gigi/pages/error/PageNotFound.templ rename to src/club/wpia/gigi/pages/error/PageNotFound.templ diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.java b/src/club/wpia/gigi/pages/main/RegisterPage.java similarity index 88% rename from src/org/cacert/gigi/pages/main/RegisterPage.java rename to src/club/wpia/gigi/pages/main/RegisterPage.java index 69dc4c10..74f91074 100644 --- a/src/org/cacert/gigi/pages/main/RegisterPage.java +++ b/src/club/wpia/gigi/pages/main/RegisterPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.main; +package club.wpia.gigi.pages.main; import java.io.IOException; import java.util.HashMap; @@ -6,10 +6,10 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; -import org.cacert.gigi.util.RateLimit; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.RateLimit; public class RegisterPage extends Page { diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.templ b/src/club/wpia/gigi/pages/main/RegisterPage.templ similarity index 100% rename from src/org/cacert/gigi/pages/main/RegisterPage.templ rename to src/club/wpia/gigi/pages/main/RegisterPage.templ diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/club/wpia/gigi/pages/main/Signup.java similarity index 87% rename from src/org/cacert/gigi/pages/main/Signup.java rename to src/club/wpia/gigi/pages/main/Signup.java index 011b6384..134df159 100644 --- a/src/org/cacert/gigi/pages/main/Signup.java +++ b/src/club/wpia/gigi/pages/main/Signup.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.main; +package club.wpia.gigi.pages.main; import java.io.IOException; import java.io.PrintWriter; @@ -7,26 +7,26 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.email.EmailProvider; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.CountrySelector; -import org.cacert.gigi.output.DateSelector; -import org.cacert.gigi.output.NameInput; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.PlainOutputable; -import org.cacert.gigi.output.template.SprintfCommand; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.output.template.TranslateCommand; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.CalendarUtil; -import org.cacert.gigi.util.HTMLEncoder; -import org.cacert.gigi.util.Notary; -import org.cacert.gigi.util.PasswordStrengthChecker; -import org.cacert.gigi.util.RateLimit.RateLimitException; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.email.EmailProvider; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.CountrySelector; +import club.wpia.gigi.output.DateSelector; +import club.wpia.gigi.output.NameInput; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.PlainOutputable; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.output.template.TranslateCommand; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.CalendarUtil; +import club.wpia.gigi.util.HTMLEncoder; +import club.wpia.gigi.util.Notary; +import club.wpia.gigi.util.PasswordStrengthChecker; +import club.wpia.gigi.util.RateLimit.RateLimitException; public class Signup extends Form { @@ -58,7 +58,7 @@ public class Signup extends Form { vars.put("country", country ? " checked=\"checked\"" : ""); vars.put("regional", regional ? " checked=\"checked\"" : ""); vars.put("radius", radius ? " checked=\"checked\"" : ""); - vars.put("helpOnNames", String.format(l.getTranslation("Help on Names %sin the wiki%s"), "", "")); + vars.put("helpOnNames", String.format(l.getTranslation("Help on Names %sin the wiki%s"), "", "")); vars.put("csrf", getCSRFToken()); vars.put("dobmin", User.MINIMUM_AGE + ""); vars.put("countryCode", cs); diff --git a/src/org/cacert/gigi/pages/main/Signup.templ b/src/club/wpia/gigi/pages/main/Signup.templ similarity index 100% rename from src/org/cacert/gigi/pages/main/Signup.templ rename to src/club/wpia/gigi/pages/main/Signup.templ diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.java b/src/club/wpia/gigi/pages/orga/AffiliationForm.java similarity index 83% rename from src/org/cacert/gigi/pages/orga/AffiliationForm.java rename to src/club/wpia/gigi/pages/orga/AffiliationForm.java index 42682fed..5ac52404 100644 --- a/src/org/cacert/gigi/pages/orga/AffiliationForm.java +++ b/src/club/wpia/gigi/pages/orga/AffiliationForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.orga; +package club.wpia.gigi.pages.orga; import java.io.PrintWriter; import java.util.Iterator; @@ -7,15 +7,15 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.Organisation.Affiliation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.LoginPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Organisation.Affiliation; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.LoginPage; public class AffiliationForm extends Form { diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.templ b/src/club/wpia/gigi/pages/orga/AffiliationForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/orga/AffiliationForm.templ rename to src/club/wpia/gigi/pages/orga/AffiliationForm.templ diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java b/src/club/wpia/gigi/pages/orga/CreateOrgForm.java similarity index 90% rename from src/org/cacert/gigi/pages/orga/CreateOrgForm.java rename to src/club/wpia/gigi/pages/orga/CreateOrgForm.java index 7b698225..3aeb727b 100644 --- a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java +++ b/src/club/wpia/gigi/pages/orga/CreateOrgForm.java @@ -1,19 +1,19 @@ -package org.cacert.gigi.pages.orga; +package club.wpia.gigi.pages.orga; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.email.EmailProvider; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.CountrySelector; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.SprintfCommand; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.LoginPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.email.EmailProvider; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.CountrySelector; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.LoginPage; public class CreateOrgForm extends Form { diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ b/src/club/wpia/gigi/pages/orga/CreateOrgForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/orga/CreateOrgForm.templ rename to src/club/wpia/gigi/pages/orga/CreateOrgForm.templ diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgPage.java b/src/club/wpia/gigi/pages/orga/CreateOrgPage.java similarity index 81% rename from src/org/cacert/gigi/pages/orga/CreateOrgPage.java rename to src/club/wpia/gigi/pages/orga/CreateOrgPage.java index 17d2a318..8c45fef5 100644 --- a/src/org/cacert/gigi/pages/orga/CreateOrgPage.java +++ b/src/club/wpia/gigi/pages/orga/CreateOrgPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.orga; +package club.wpia.gigi.pages.orga; import java.io.IOException; import java.util.HashMap; @@ -6,9 +6,9 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.pages.ManagedFormPage; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.pages.ManagedFormPage; +import club.wpia.gigi.util.AuthorizationContext; public class CreateOrgPage extends ManagedFormPage { diff --git a/src/org/cacert/gigi/pages/orga/EditOrg.templ b/src/club/wpia/gigi/pages/orga/EditOrg.templ similarity index 100% rename from src/org/cacert/gigi/pages/orga/EditOrg.templ rename to src/club/wpia/gigi/pages/orga/EditOrg.templ diff --git a/src/org/cacert/gigi/pages/orga/OrgDomainAddForm.java b/src/club/wpia/gigi/pages/orga/OrgDomainAddForm.java similarity index 71% rename from src/org/cacert/gigi/pages/orga/OrgDomainAddForm.java rename to src/club/wpia/gigi/pages/orga/OrgDomainAddForm.java index 78e04b40..a593a673 100644 --- a/src/org/cacert/gigi/pages/orga/OrgDomainAddForm.java +++ b/src/club/wpia/gigi/pages/orga/OrgDomainAddForm.java @@ -1,17 +1,17 @@ -package org.cacert.gigi.pages.orga; +package club.wpia.gigi.pages.orga; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.LoginPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.LoginPage; public class OrgDomainAddForm extends Form { diff --git a/src/org/cacert/gigi/pages/orga/OrgDomainAddForm.templ b/src/club/wpia/gigi/pages/orga/OrgDomainAddForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/orga/OrgDomainAddForm.templ rename to src/club/wpia/gigi/pages/orga/OrgDomainAddForm.templ diff --git a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java b/src/club/wpia/gigi/pages/orga/ViewOrgPage.java similarity index 87% rename from src/org/cacert/gigi/pages/orga/ViewOrgPage.java rename to src/club/wpia/gigi/pages/orga/ViewOrgPage.java index 0924a898..ec4fb365 100644 --- a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java +++ b/src/club/wpia/gigi/pages/orga/ViewOrgPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.orga; +package club.wpia.gigi.pages.orga; import java.io.IOException; import java.io.PrintWriter; @@ -9,17 +9,17 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Form.CSRFException; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.ManagedMultiFormPage; -import org.cacert.gigi.pages.account.domain.DomainManagementForm; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.output.template.Form.CSRFException; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.ManagedMultiFormPage; +import club.wpia.gigi.pages.account.domain.DomainManagementForm; +import club.wpia.gigi.util.AuthorizationContext; public class ViewOrgPage extends ManagedMultiFormPage { diff --git a/src/org/cacert/gigi/pages/orga/ViewOrgs.templ b/src/club/wpia/gigi/pages/orga/ViewOrgs.templ similarity index 100% rename from src/org/cacert/gigi/pages/orga/ViewOrgs.templ rename to src/club/wpia/gigi/pages/orga/ViewOrgs.templ diff --git a/src/org/cacert/gigi/pages/statistics/StatisticsRoles.java b/src/club/wpia/gigi/pages/statistics/StatisticsRoles.java similarity index 85% rename from src/org/cacert/gigi/pages/statistics/StatisticsRoles.java rename to src/club/wpia/gigi/pages/statistics/StatisticsRoles.java index c1b10e2f..648c7ee6 100644 --- a/src/org/cacert/gigi/pages/statistics/StatisticsRoles.java +++ b/src/club/wpia/gigi/pages/statistics/StatisticsRoles.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.statistics; +package club.wpia.gigi.pages.statistics; import java.io.IOException; import java.util.HashMap; @@ -7,12 +7,12 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.ArrayIterable; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.Page; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.ArrayIterable; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.Page; public class StatisticsRoles extends Page { diff --git a/src/org/cacert/gigi/pages/statistics/StatisticsRoles.templ b/src/club/wpia/gigi/pages/statistics/StatisticsRoles.templ similarity index 100% rename from src/org/cacert/gigi/pages/statistics/StatisticsRoles.templ rename to src/club/wpia/gigi/pages/statistics/StatisticsRoles.templ diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/club/wpia/gigi/pages/wot/AssuranceForm.java similarity index 90% rename from src/org/cacert/gigi/pages/wot/AssuranceForm.java rename to src/club/wpia/gigi/pages/wot/AssuranceForm.java index b46dfdd5..f4bda1ee 100644 --- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java +++ b/src/club/wpia/gigi/pages/wot/AssuranceForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.wot; +package club.wpia.gigi.pages.wot; import java.io.PrintWriter; import java.text.SimpleDateFormat; @@ -11,23 +11,23 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Assurance.AssuranceType; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.ArrayIterable; -import org.cacert.gigi.output.CountrySelector; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.SprintfCommand; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.output.template.TranslateCommand; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.pages.PasswordResetPage; -import org.cacert.gigi.util.DayDate; -import org.cacert.gigi.util.Notary; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Assurance.AssuranceType; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.ArrayIterable; +import club.wpia.gigi.output.CountrySelector; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.SprintfCommand; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.output.template.TranslateCommand; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.pages.PasswordResetPage; +import club.wpia.gigi.util.DayDate; +import club.wpia.gigi.util.Notary; public class AssuranceForm extends Form { diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/club/wpia/gigi/pages/wot/AssuranceForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/wot/AssuranceForm.templ rename to src/club/wpia/gigi/pages/wot/AssuranceForm.templ diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/club/wpia/gigi/pages/wot/AssurePage.java similarity index 87% rename from src/org/cacert/gigi/pages/wot/AssurePage.java rename to src/club/wpia/gigi/pages/wot/AssurePage.java index 8ce8f72b..cc0c5a07 100644 --- a/src/org/cacert/gigi/pages/wot/AssurePage.java +++ b/src/club/wpia/gigi/pages/wot/AssurePage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.wot; +package club.wpia.gigi.pages.wot; import java.io.IOException; import java.io.PrintWriter; @@ -7,15 +7,15 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.output.DateSelector; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.output.DateSelector; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; public class AssurePage extends Page { @@ -75,7 +75,7 @@ public class AssurePage extends Page { id = rs.getInt(1); boolean verified = rs.getBoolean(2); if (rs.next()) { - out.println("Error, ambigous user. Please contact support@cacert.org."); + out.println("Error, ambigous user. Please contact support."); } else { if ( !verified) { out.println(translate(req, "User is not yet verified. Please try again in 24 hours!")); diff --git a/src/org/cacert/gigi/pages/wot/AssureeSearch.templ b/src/club/wpia/gigi/pages/wot/AssureeSearch.templ similarity index 100% rename from src/org/cacert/gigi/pages/wot/AssureeSearch.templ rename to src/club/wpia/gigi/pages/wot/AssureeSearch.templ diff --git a/src/org/cacert/gigi/pages/wot/Points.java b/src/club/wpia/gigi/pages/wot/Points.java similarity index 91% rename from src/org/cacert/gigi/pages/wot/Points.java rename to src/club/wpia/gigi/pages/wot/Points.java index 45387352..039d39d9 100644 --- a/src/org/cacert/gigi/pages/wot/Points.java +++ b/src/club/wpia/gigi/pages/wot/Points.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.wot; +package club.wpia.gigi.pages.wot; import java.io.IOException; import java.util.HashMap; @@ -6,10 +6,10 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.output.AssurancesDisplay; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.output.AssurancesDisplay; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; public class Points extends Page { diff --git a/src/org/cacert/gigi/pages/wot/Points.templ b/src/club/wpia/gigi/pages/wot/Points.templ similarity index 100% rename from src/org/cacert/gigi/pages/wot/Points.templ rename to src/club/wpia/gigi/pages/wot/Points.templ diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPForm.java b/src/club/wpia/gigi/pages/wot/RequestTTPForm.java similarity index 77% rename from src/org/cacert/gigi/pages/wot/RequestTTPForm.java rename to src/club/wpia/gigi/pages/wot/RequestTTPForm.java index 7348346f..8045d82d 100644 --- a/src/org/cacert/gigi/pages/wot/RequestTTPForm.java +++ b/src/club/wpia/gigi/pages/wot/RequestTTPForm.java @@ -1,19 +1,19 @@ -package org.cacert.gigi.pages.wot; +package club.wpia.gigi.pages.wot; import java.io.PrintWriter; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.OutputableArrayIterable; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.output.template.TranslateCommand; -import org.cacert.gigi.pages.LoginPage; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.output.template.OutputableArrayIterable; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.output.template.TranslateCommand; +import club.wpia.gigi.pages.LoginPage; public class RequestTTPForm extends Form { diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ b/src/club/wpia/gigi/pages/wot/RequestTTPForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/wot/RequestTTPForm.templ rename to src/club/wpia/gigi/pages/wot/RequestTTPForm.templ diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPPage.java b/src/club/wpia/gigi/pages/wot/RequestTTPPage.java similarity index 87% rename from src/org/cacert/gigi/pages/wot/RequestTTPPage.java rename to src/club/wpia/gigi/pages/wot/RequestTTPPage.java index f4b739c4..a83de6c5 100644 --- a/src/org/cacert/gigi/pages/wot/RequestTTPPage.java +++ b/src/club/wpia/gigi/pages/wot/RequestTTPPage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.wot; +package club.wpia.gigi.pages.wot; import java.io.IOException; import java.util.HashMap; @@ -6,12 +6,12 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.dbObjects.Assurance; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.util.AuthorizationContext; +import club.wpia.gigi.dbObjects.Assurance; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.output.template.Form; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.util.AuthorizationContext; public class RequestTTPPage extends Page { diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ b/src/club/wpia/gigi/pages/wot/RequestTTPPage.templ similarity index 100% rename from src/org/cacert/gigi/pages/wot/RequestTTPPage.templ rename to src/club/wpia/gigi/pages/wot/RequestTTPPage.templ diff --git a/src/org/cacert/gigi/pages/wot/Rules.templ b/src/club/wpia/gigi/pages/wot/Rules.templ similarity index 100% rename from src/org/cacert/gigi/pages/wot/Rules.templ rename to src/club/wpia/gigi/pages/wot/Rules.templ diff --git a/src/org/cacert/gigi/ping/DNSPinger.java b/src/club/wpia/gigi/ping/DNSPinger.java similarity index 89% rename from src/org/cacert/gigi/ping/DNSPinger.java rename to src/club/wpia/gigi/ping/DNSPinger.java index f9a4e710..aeb41e5f 100644 --- a/src/org/cacert/gigi/ping/DNSPinger.java +++ b/src/club/wpia/gigi/ping/DNSPinger.java @@ -1,14 +1,14 @@ -package org.cacert.gigi.ping; +package club.wpia.gigi.ping; import java.util.Arrays; import java.util.List; import javax.naming.NamingException; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.util.DNSUtil; -import org.cacert.gigi.util.SystemKeywords; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.util.DNSUtil; +import club.wpia.gigi.util.SystemKeywords; public class DNSPinger extends DomainPinger { diff --git a/src/org/cacert/gigi/ping/DomainPinger.java b/src/club/wpia/gigi/ping/DomainPinger.java similarity index 89% rename from src/org/cacert/gigi/ping/DomainPinger.java rename to src/club/wpia/gigi/ping/DomainPinger.java index c5eb3926..fcb8f12e 100644 --- a/src/org/cacert/gigi/ping/DomainPinger.java +++ b/src/club/wpia/gigi/ping/DomainPinger.java @@ -1,9 +1,9 @@ -package org.cacert.gigi.ping; +package club.wpia.gigi.ping; -import org.cacert.gigi.database.DBEnum; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Domain; +import club.wpia.gigi.database.DBEnum; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Domain; public abstract class DomainPinger { diff --git a/src/org/cacert/gigi/ping/EmailPinger.java b/src/club/wpia/gigi/ping/EmailPinger.java similarity index 75% rename from src/org/cacert/gigi/ping/EmailPinger.java rename to src/club/wpia/gigi/ping/EmailPinger.java index dfb2b74a..454ba81d 100644 --- a/src/org/cacert/gigi/ping/EmailPinger.java +++ b/src/club/wpia/gigi/ping/EmailPinger.java @@ -1,14 +1,14 @@ -package org.cacert.gigi.ping; +package club.wpia.gigi.ping; import java.io.IOException; import java.util.Locale; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.email.MailProbe; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.util.RandomToken; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.email.MailProbe; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.util.RandomToken; public class EmailPinger extends DomainPinger { diff --git a/src/org/cacert/gigi/ping/HTTPFetch.java b/src/club/wpia/gigi/ping/HTTPFetch.java similarity index 90% rename from src/org/cacert/gigi/ping/HTTPFetch.java rename to src/club/wpia/gigi/ping/HTTPFetch.java index 1f31ccd6..7ad08b55 100644 --- a/src/org/cacert/gigi/ping/HTTPFetch.java +++ b/src/club/wpia/gigi/ping/HTTPFetch.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.ping; +package club.wpia.gigi.ping; import java.io.BufferedReader; import java.io.IOException; @@ -6,9 +6,9 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.util.SystemKeywords; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.util.SystemKeywords; public class HTTPFetch extends DomainPinger { diff --git a/src/org/cacert/gigi/ping/PingerDaemon.java b/src/club/wpia/gigi/ping/PingerDaemon.java similarity index 90% rename from src/org/cacert/gigi/ping/PingerDaemon.java rename to src/club/wpia/gigi/ping/PingerDaemon.java index d499679c..1cd48cf1 100644 --- a/src/org/cacert/gigi/ping/PingerDaemon.java +++ b/src/club/wpia/gigi/ping/PingerDaemon.java @@ -1,18 +1,18 @@ -package org.cacert.gigi.ping; +package club.wpia.gigi.ping; import java.security.KeyStore; import java.util.HashMap; import java.util.LinkedList; import java.util.Queue; -import org.cacert.gigi.database.DatabaseConnection; -import org.cacert.gigi.database.DatabaseConnection.Link; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.DomainPingConfiguration; -import org.cacert.gigi.dbObjects.DomainPingType; -import org.cacert.gigi.util.RandomToken; +import club.wpia.gigi.database.DatabaseConnection; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.database.DatabaseConnection.Link; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.DomainPingConfiguration; +import club.wpia.gigi.dbObjects.DomainPingType; +import club.wpia.gigi.util.RandomToken; public class PingerDaemon extends Thread { diff --git a/src/org/cacert/gigi/ping/SSLPinger.java b/src/club/wpia/gigi/ping/SSLPinger.java similarity index 98% rename from src/org/cacert/gigi/ping/SSLPinger.java rename to src/club/wpia/gigi/ping/SSLPinger.java index 7db5a6b1..db0f0f52 100644 --- a/src/org/cacert/gigi/ping/SSLPinger.java +++ b/src/club/wpia/gigi/ping/SSLPinger.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.ping; +package club.wpia.gigi.ping; import java.io.IOException; import java.io.InputStream; @@ -29,11 +29,10 @@ import javax.net.ssl.X509TrustManager; import javax.security.cert.CertificateException; import javax.security.cert.X509Certificate; -import org.cacert.gigi.dbObjects.CACertificate; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Domain; - +import club.wpia.gigi.dbObjects.CACertificate; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Domain; import sun.security.x509.AVA; import sun.security.x509.X500Name; diff --git a/src/org/cacert/gigi/util/AuthorizationContext.java b/src/club/wpia/gigi/util/AuthorizationContext.java similarity index 87% rename from src/org/cacert/gigi/util/AuthorizationContext.java rename to src/club/wpia/gigi/util/AuthorizationContext.java index 892f1175..fdc9187b 100644 --- a/src/org/cacert/gigi/util/AuthorizationContext.java +++ b/src/club/wpia/gigi/util/AuthorizationContext.java @@ -1,18 +1,18 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.PrintWriter; import java.io.Serializable; import java.util.Arrays; import java.util.Map; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.SprintfCommand; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.SprintfCommand; public class AuthorizationContext implements Outputable, Serializable { diff --git a/src/org/cacert/gigi/util/CAA.java b/src/club/wpia/gigi/util/CAA.java similarity index 94% rename from src/org/cacert/gigi/util/CAA.java rename to src/club/wpia/gigi/util/CAA.java index 58350539..7100b557 100644 --- a/src/org/cacert/gigi/util/CAA.java +++ b/src/club/wpia/gigi/util/CAA.java @@ -1,11 +1,11 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import javax.naming.NamingException; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.output.template.SprintfCommand; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.output.template.SprintfCommand; public class CAA { diff --git a/src/org/cacert/gigi/util/CalendarUtil.java b/src/club/wpia/gigi/util/CalendarUtil.java similarity index 97% rename from src/org/cacert/gigi/util/CalendarUtil.java rename to src/club/wpia/gigi/util/CalendarUtil.java index 7d654077..6ff7bb29 100644 --- a/src/org/cacert/gigi/util/CalendarUtil.java +++ b/src/club/wpia/gigi/util/CalendarUtil.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.util.Calendar; import java.util.Date; diff --git a/src/org/cacert/gigi/util/CertExporter.java b/src/club/wpia/gigi/util/CertExporter.java similarity index 98% rename from src/org/cacert/gigi/util/CertExporter.java rename to src/club/wpia/gigi/util/CertExporter.java index c227f09c..cfe97ef2 100644 --- a/src/org/cacert/gigi/util/CertExporter.java +++ b/src/club/wpia/gigi/util/CertExporter.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.IOException; import java.math.BigInteger; @@ -14,9 +14,8 @@ import java.util.Set; import javax.servlet.ServletOutputStream; -import org.cacert.gigi.dbObjects.CACertificate; -import org.cacert.gigi.dbObjects.Certificate; - +import club.wpia.gigi.dbObjects.CACertificate; +import club.wpia.gigi.dbObjects.Certificate; import sun.security.pkcs.ContentInfo; import sun.security.pkcs.PKCS7; import sun.security.pkcs.SignerInfo; diff --git a/src/org/cacert/gigi/util/CipherInfo.java b/src/club/wpia/gigi/util/CipherInfo.java similarity index 99% rename from src/org/cacert/gigi/util/CipherInfo.java rename to src/club/wpia/gigi/util/CipherInfo.java index 7e5ecc17..9fda8ca4 100644 --- a/src/org/cacert/gigi/util/CipherInfo.java +++ b/src/club/wpia/gigi/util/CipherInfo.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/org/cacert/gigi/util/DNSUtil.java b/src/club/wpia/gigi/util/DNSUtil.java similarity index 97% rename from src/org/cacert/gigi/util/DNSUtil.java rename to src/club/wpia/gigi/util/DNSUtil.java index d0c772af..5bec9969 100644 --- a/src/org/cacert/gigi/util/DNSUtil.java +++ b/src/club/wpia/gigi/util/DNSUtil.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.util.Arrays; import java.util.Hashtable; @@ -9,7 +9,7 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.InitialDirContext; -import org.cacert.gigi.util.CAA.CAARecord; +import club.wpia.gigi.util.CAA.CAARecord; public class DNSUtil { diff --git a/src/org/cacert/gigi/util/DayDate.java b/src/club/wpia/gigi/util/DayDate.java similarity index 98% rename from src/org/cacert/gigi/util/DayDate.java rename to src/club/wpia/gigi/util/DayDate.java index a38e318c..8ade3427 100644 --- a/src/org/cacert/gigi/util/DayDate.java +++ b/src/club/wpia/gigi/util/DayDate.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.sql.Date; diff --git a/src/org/cacert/gigi/util/DomainAssessment.java b/src/club/wpia/gigi/util/DomainAssessment.java similarity index 98% rename from src/org/cacert/gigi/util/DomainAssessment.java rename to src/club/wpia/gigi/util/DomainAssessment.java index f48012f8..d24404ed 100644 --- a/src/org/cacert/gigi/util/DomainAssessment.java +++ b/src/club/wpia/gigi/util/DomainAssessment.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.BufferedReader; import java.io.File; @@ -13,7 +13,7 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; -import org.cacert.gigi.GigiApiException; +import club.wpia.gigi.GigiApiException; public class DomainAssessment { diff --git a/src/org/cacert/gigi/util/EditDistance.java b/src/club/wpia/gigi/util/EditDistance.java similarity index 98% rename from src/org/cacert/gigi/util/EditDistance.java rename to src/club/wpia/gigi/util/EditDistance.java index 0cadd213..d1d230cd 100644 --- a/src/org/cacert/gigi/util/EditDistance.java +++ b/src/club/wpia/gigi/util/EditDistance.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; public class EditDistance { diff --git a/src/org/cacert/gigi/util/HTMLEncoder.java b/src/club/wpia/gigi/util/HTMLEncoder.java similarity index 90% rename from src/org/cacert/gigi/util/HTMLEncoder.java rename to src/club/wpia/gigi/util/HTMLEncoder.java index ed943cbe..3d50f14a 100644 --- a/src/org/cacert/gigi/util/HTMLEncoder.java +++ b/src/club/wpia/gigi/util/HTMLEncoder.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; public class HTMLEncoder { diff --git a/src/org/cacert/gigi/util/KeyStorage.java b/src/club/wpia/gigi/util/KeyStorage.java similarity index 96% rename from src/org/cacert/gigi/util/KeyStorage.java rename to src/club/wpia/gigi/util/KeyStorage.java index 7ce0d285..b87df9a7 100644 --- a/src/org/cacert/gigi/util/KeyStorage.java +++ b/src/club/wpia/gigi/util/KeyStorage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.File; diff --git a/src/org/cacert/gigi/util/Notary.java b/src/club/wpia/gigi/util/Notary.java similarity index 95% rename from src/org/cacert/gigi/util/Notary.java rename to src/club/wpia/gigi/util/Notary.java index 33bf674e..3df11763 100644 --- a/src/org/cacert/gigi/util/Notary.java +++ b/src/club/wpia/gigi/util/Notary.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.IOException; import java.text.ParseException; @@ -8,19 +8,19 @@ import java.util.GregorianCalendar; import java.util.HashMap; import java.util.Map; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.Assurance.AssuranceType; -import org.cacert.gigi.dbObjects.Country; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.ArrayIterable; -import org.cacert.gigi.output.DateSelector; -import org.cacert.gigi.output.template.MailTemplate; -import org.cacert.gigi.output.template.SprintfCommand; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Assurance.AssuranceType; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.ArrayIterable; +import club.wpia.gigi.output.DateSelector; +import club.wpia.gigi.output.template.MailTemplate; +import club.wpia.gigi.output.template.SprintfCommand; public class Notary { diff --git a/src/org/cacert/gigi/util/PEM.java b/src/club/wpia/gigi/util/PEM.java similarity index 96% rename from src/org/cacert/gigi/util/PEM.java rename to src/club/wpia/gigi/util/PEM.java index 3be46531..211ebc60 100644 --- a/src/org/cacert/gigi/util/PEM.java +++ b/src/club/wpia/gigi/util/PEM.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.util.Base64; import java.util.regex.Pattern; diff --git a/src/org/cacert/gigi/util/PasswordHash.java b/src/club/wpia/gigi/util/PasswordHash.java similarity index 99% rename from src/org/cacert/gigi/util/PasswordHash.java rename to src/club/wpia/gigi/util/PasswordHash.java index 97e3493a..51dffb70 100644 --- a/src/org/cacert/gigi/util/PasswordHash.java +++ b/src/club/wpia/gigi/util/PasswordHash.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; diff --git a/src/org/cacert/gigi/util/PasswordStrengthChecker.java b/src/club/wpia/gigi/util/PasswordStrengthChecker.java similarity index 94% rename from src/org/cacert/gigi/util/PasswordStrengthChecker.java rename to src/club/wpia/gigi/util/PasswordStrengthChecker.java index c957665e..21aa533f 100644 --- a/src/org/cacert/gigi/util/PasswordStrengthChecker.java +++ b/src/club/wpia/gigi/util/PasswordStrengthChecker.java @@ -1,11 +1,11 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.util.TreeSet; import java.util.regex.Pattern; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.dbObjects.NamePart; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.NamePart; public class PasswordStrengthChecker { diff --git a/src/org/cacert/gigi/util/PublicSuffixes.java b/src/club/wpia/gigi/util/PublicSuffixes.java similarity index 99% rename from src/org/cacert/gigi/util/PublicSuffixes.java rename to src/club/wpia/gigi/util/PublicSuffixes.java index 19c7b1dc..401502f7 100644 --- a/src/org/cacert/gigi/util/PublicSuffixes.java +++ b/src/club/wpia/gigi/util/PublicSuffixes.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/org/cacert/gigi/util/RandomToken.java b/src/club/wpia/gigi/util/RandomToken.java similarity index 95% rename from src/org/cacert/gigi/util/RandomToken.java rename to src/club/wpia/gigi/util/RandomToken.java index 8a11c8f0..90bbd1e6 100644 --- a/src/org/cacert/gigi/util/RandomToken.java +++ b/src/club/wpia/gigi/util/RandomToken.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.security.SecureRandom; diff --git a/src/org/cacert/gigi/util/RateLimit.java b/src/club/wpia/gigi/util/RateLimit.java similarity index 96% rename from src/org/cacert/gigi/util/RateLimit.java rename to src/club/wpia/gigi/util/RateLimit.java index d7873a03..795d5a63 100644 --- a/src/org/cacert/gigi/util/RateLimit.java +++ b/src/club/wpia/gigi/util/RateLimit.java @@ -1,9 +1,9 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.util.HashMap; import java.util.TreeSet; -import org.cacert.gigi.GigiApiException; +import club.wpia.gigi.GigiApiException; public class RateLimit { diff --git a/src/org/cacert/gigi/util/ServerConstants.java b/src/club/wpia/gigi/util/ServerConstants.java similarity index 91% rename from src/org/cacert/gigi/util/ServerConstants.java rename to src/club/wpia/gigi/util/ServerConstants.java index 73bf9d2e..d3901e8d 100644 --- a/src/org/cacert/gigi/util/ServerConstants.java +++ b/src/club/wpia/gigi/util/ServerConstants.java @@ -1,20 +1,20 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.util.Properties; public class ServerConstants { - private static String wwwHostName = "www.cacert.local"; + private static String wwwHostName = "www.wpia.local"; - private static String secureHostName = "secure.cacert.local"; + private static String secureHostName = "secure.wpia.local"; - private static String staticHostName = "static.cacert.local"; + private static String staticHostName = "static.wpia.local"; - private static String apiHostName = "api.cacert.local"; + private static String apiHostName = "api.wpia.local"; private static String securePort, port, secureBindPort, bindPort; - private static String suffix = "cacert.local"; + private static String suffix = "wpia.local"; public static void init(Properties conf) { securePort = port = ""; diff --git a/src/org/cacert/gigi/util/SystemKeywords.java b/src/club/wpia/gigi/util/SystemKeywords.java similarity index 92% rename from src/org/cacert/gigi/util/SystemKeywords.java rename to src/club/wpia/gigi/util/SystemKeywords.java index 8060e890..847df894 100644 --- a/src/org/cacert/gigi/util/SystemKeywords.java +++ b/src/club/wpia/gigi/util/SystemKeywords.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; public class SystemKeywords { diff --git a/src/org/cacert/gigi/util/TimeConditions.java b/src/club/wpia/gigi/util/TimeConditions.java similarity index 97% rename from src/org/cacert/gigi/util/TimeConditions.java rename to src/club/wpia/gigi/util/TimeConditions.java index b851dc9d..33968814 100644 --- a/src/org/cacert/gigi/util/TimeConditions.java +++ b/src/club/wpia/gigi/util/TimeConditions.java @@ -1,8 +1,8 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.util.Properties; -import org.cacert.gigi.dbObjects.CATS; +import club.wpia.gigi.dbObjects.CATS; public class TimeConditions { diff --git a/src/org/cacert/gigi/util/VerificationAgentEntered.templ b/src/club/wpia/gigi/util/VerificationAgentEntered.templ similarity index 100% rename from src/org/cacert/gigi/util/VerificationAgentEntered.templ rename to src/club/wpia/gigi/util/VerificationAgentEntered.templ diff --git a/src/org/cacert/gigi/util/VerificationEntered.templ b/src/club/wpia/gigi/util/VerificationEntered.templ similarity index 100% rename from src/org/cacert/gigi/util/VerificationEntered.templ rename to src/club/wpia/gigi/util/VerificationEntered.templ diff --git a/src/org/cacert/gigi/util/idn_enabled.dat b/src/club/wpia/gigi/util/idn_enabled.dat similarity index 100% rename from src/org/cacert/gigi/util/idn_enabled.dat rename to src/club/wpia/gigi/util/idn_enabled.dat diff --git a/tests/org/cacert/gigi/DomainVerification.java b/tests/club/wpia/gigi/DomainVerification.java similarity index 87% rename from tests/org/cacert/gigi/DomainVerification.java rename to tests/club/wpia/gigi/DomainVerification.java index cc2d01ab..87096397 100644 --- a/tests/org/cacert/gigi/DomainVerification.java +++ b/tests/club/wpia/gigi/DomainVerification.java @@ -1,16 +1,17 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; -import org.cacert.gigi.testUtils.ConfiguredTest; -import org.cacert.gigi.util.DomainAssessment; import org.junit.Test; +import club.wpia.gigi.testUtils.ConfiguredTest; +import club.wpia.gigi.util.DomainAssessment; + public class DomainVerification extends ConfiguredTest { @Test public void testDomainPart() { - assertTrue(DomainAssessment.isValidDomainPart("cacert")); + assertTrue(DomainAssessment.isValidDomainPart("wpia")); assertTrue(DomainAssessment.isValidDomainPart("de")); assertTrue(DomainAssessment.isValidDomainPart("ha2-a")); assertTrue(DomainAssessment.isValidDomainPart("ha2--a")); @@ -27,12 +28,10 @@ public class DomainVerification extends ConfiguredTest { @Test public void testDomainCertifiable() { - isCertifiableDomain(true, "cacert.org", false); - isCertifiableDomain(true, "cacert.de", false); - isCertifiableDomain(true, "cacert.org", false); - isCertifiableDomain(true, "cacert.org", false); + isCertifiableDomain(true, "wpia.club", false); + isCertifiableDomain(true, "wpia.de", false); isCertifiableDomain(true, "1234.org", false); - isCertifiableDomain(false, "a.cacert.org", true); + isCertifiableDomain(false, "a.wpia.club", true); isCertifiableDomain(false, "gigi.local", true); isCertifiableDomain(false, "org", true); isCertifiableDomain(false, "'a.org", true); diff --git a/tests/org/cacert/gigi/LoginTest.java b/tests/club/wpia/gigi/LoginTest.java similarity index 93% rename from tests/org/cacert/gigi/LoginTest.java rename to tests/club/wpia/gigi/LoginTest.java index ed1c932a..ab2780c4 100644 --- a/tests/org/cacert/gigi/LoginTest.java +++ b/tests/club/wpia/gigi/LoginTest.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -13,14 +13,15 @@ import java.security.KeyPair; import java.security.PrivateKey; import java.security.cert.X509Certificate; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.ManagedTest; + public class LoginTest extends ManagedTest { @Test diff --git a/tests/org/cacert/gigi/TestCalendarUtil.java b/tests/club/wpia/gigi/TestCalendarUtil.java similarity index 95% rename from tests/org/cacert/gigi/TestCalendarUtil.java rename to tests/club/wpia/gigi/TestCalendarUtil.java index 47ce3b99..5bed6e56 100644 --- a/tests/org/cacert/gigi/TestCalendarUtil.java +++ b/tests/club/wpia/gigi/TestCalendarUtil.java @@ -1,14 +1,15 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; import java.util.Calendar; import java.util.TimeZone; -import org.cacert.gigi.util.CalendarUtil; -import org.cacert.gigi.util.DayDate; import org.junit.Test; +import club.wpia.gigi.util.CalendarUtil; +import club.wpia.gigi.util.DayDate; + public class TestCalendarUtil { @Test diff --git a/tests/org/cacert/gigi/TestCertificate.java b/tests/club/wpia/gigi/TestCertificate.java similarity index 91% rename from tests/org/cacert/gigi/TestCertificate.java rename to tests/club/wpia/gigi/TestCertificate.java index 0305d509..d791bfd0 100644 --- a/tests/org/cacert/gigi/TestCertificate.java +++ b/tests/club/wpia/gigi/TestCertificate.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; @@ -11,18 +11,18 @@ import java.sql.SQLException; import java.util.Collection; import java.util.List; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.dbObjects.Certificate.SANType; -import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.account.certs.Certificates; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.dbObjects.Certificate.SANType; +import club.wpia.gigi.dbObjects.Certificate.SubjectAlternateName; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.account.certs.Certificates; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.ManagedTest; import sun.security.x509.GeneralNameInterface; public class TestCertificate extends ManagedTest { diff --git a/tests/org/cacert/gigi/TestCrossDomainAccess.java b/tests/club/wpia/gigi/TestCrossDomainAccess.java similarity index 91% rename from tests/org/cacert/gigi/TestCrossDomainAccess.java rename to tests/club/wpia/gigi/TestCrossDomainAccess.java index ee3584fd..fbcc3009 100644 --- a/tests/org/cacert/gigi/TestCrossDomainAccess.java +++ b/tests/club/wpia/gigi/TestCrossDomainAccess.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; @@ -12,15 +12,16 @@ import java.security.KeyPair; import java.security.PrivateKey; import java.sql.SQLException; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.ManagedTest; -import org.cacert.gigi.util.ServerConstants; import org.junit.Test; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.ManagedTest; +import club.wpia.gigi.util.ServerConstants; + public class TestCrossDomainAccess extends ManagedTest { @Test diff --git a/tests/org/cacert/gigi/TestDomain.java b/tests/club/wpia/gigi/TestDomain.java similarity index 95% rename from tests/org/cacert/gigi/TestDomain.java rename to tests/club/wpia/gigi/TestDomain.java index 285fca9a..ccdf1139 100644 --- a/tests/org/cacert/gigi/TestDomain.java +++ b/tests/club/wpia/gigi/TestDomain.java @@ -1,11 +1,12 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.testUtils.ClientBusinessTest; import org.junit.Test; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.testUtils.ClientBusinessTest; + public class TestDomain extends ClientBusinessTest { @Test diff --git a/tests/org/cacert/gigi/TestLanguage.java b/tests/club/wpia/gigi/TestLanguage.java similarity index 93% rename from tests/org/cacert/gigi/TestLanguage.java rename to tests/club/wpia/gigi/TestLanguage.java index 912cab6f..2cc4563c 100644 --- a/tests/org/cacert/gigi/TestLanguage.java +++ b/tests/club/wpia/gigi/TestLanguage.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -6,13 +6,14 @@ import static org.junit.Assert.*; import java.io.IOException; import java.util.Locale; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Assume; import org.junit.Test; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.ManagedTest; + public class TestLanguage extends ManagedTest { @Test diff --git a/tests/org/cacert/gigi/TestName.java b/tests/club/wpia/gigi/TestName.java similarity index 96% rename from tests/org/cacert/gigi/TestName.java rename to tests/club/wpia/gigi/TestName.java index ba901a8a..51234f83 100644 --- a/tests/org/cacert/gigi/TestName.java +++ b/tests/club/wpia/gigi/TestName.java @@ -1,14 +1,15 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.dbObjects.NamePart; -import org.cacert.gigi.dbObjects.NamePart.NamePartType; -import org.cacert.gigi.testUtils.ClientBusinessTest; import org.junit.Before; import org.junit.Test; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.NamePart; +import club.wpia.gigi.dbObjects.NamePart.NamePartType; +import club.wpia.gigi.testUtils.ClientBusinessTest; + public class TestName extends ClientBusinessTest { @Before diff --git a/tests/org/cacert/gigi/TestObjectCache.java b/tests/club/wpia/gigi/TestObjectCache.java similarity index 87% rename from tests/org/cacert/gigi/TestObjectCache.java rename to tests/club/wpia/gigi/TestObjectCache.java index 1d35669b..fda39d26 100644 --- a/tests/org/cacert/gigi/TestObjectCache.java +++ b/tests/club/wpia/gigi/TestObjectCache.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -7,12 +7,13 @@ import java.sql.SQLException; import java.util.Calendar; import java.util.Locale; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.ClientBusinessTest; import org.junit.Test; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.testUtils.ClientBusinessTest; + public class TestObjectCache extends ClientBusinessTest { @Test diff --git a/tests/org/cacert/gigi/TestOrga.java b/tests/club/wpia/gigi/TestOrga.java similarity index 86% rename from tests/org/cacert/gigi/TestOrga.java rename to tests/club/wpia/gigi/TestOrga.java index ff3a56cc..8a7f7a52 100644 --- a/tests/org/cacert/gigi/TestOrga.java +++ b/tests/club/wpia/gigi/TestOrga.java @@ -1,17 +1,18 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; import java.io.IOException; -import org.cacert.gigi.dbObjects.Country; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.BusinessTest; import org.junit.Test; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.testUtils.BusinessTest; + public class TestOrga extends BusinessTest { @Test diff --git a/tests/org/cacert/gigi/TestPasswordReset.java b/tests/club/wpia/gigi/TestPasswordReset.java similarity index 93% rename from tests/org/cacert/gigi/TestPasswordReset.java rename to tests/club/wpia/gigi/TestPasswordReset.java index 18402106..7da85e19 100644 --- a/tests/org/cacert/gigi/TestPasswordReset.java +++ b/tests/club/wpia/gigi/TestPasswordReset.java @@ -1,14 +1,15 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; import java.io.IOException; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.ClientTest; -import org.cacert.gigi.util.RandomToken; import org.junit.Test; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.util.RandomToken; + public class TestPasswordReset extends ClientTest { String pub = RandomToken.generateToken(32); diff --git a/tests/org/cacert/gigi/TestSQL.java b/tests/club/wpia/gigi/TestSQL.java similarity index 84% rename from tests/org/cacert/gigi/TestSQL.java rename to tests/club/wpia/gigi/TestSQL.java index f7f6df7a..2addd7e2 100644 --- a/tests/org/cacert/gigi/TestSQL.java +++ b/tests/club/wpia/gigi/TestSQL.java @@ -1,12 +1,13 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; -import org.cacert.gigi.database.DatabaseConnection; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.testUtils.ConfiguredTest; import org.junit.Test; +import club.wpia.gigi.database.DatabaseConnection; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.testUtils.ConfiguredTest; + public class TestSQL extends ConfiguredTest { @Test diff --git a/tests/org/cacert/gigi/TestSSL.java b/tests/club/wpia/gigi/TestSSL.java similarity index 96% rename from tests/org/cacert/gigi/TestSSL.java rename to tests/club/wpia/gigi/TestSSL.java index 74806eef..24e6cc88 100644 --- a/tests/org/cacert/gigi/TestSSL.java +++ b/tests/club/wpia/gigi/TestSSL.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import java.io.EOFException; import java.io.IOException; @@ -13,10 +13,11 @@ import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLEngineResult.HandshakeStatus; import javax.net.ssl.SSLException; -import org.cacert.gigi.testUtils.InitTruststore; -import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; +import club.wpia.gigi.testUtils.InitTruststore; +import club.wpia.gigi.testUtils.ManagedTest; + public class TestSSL extends ManagedTest { private ByteBuffer in; diff --git a/tests/org/cacert/gigi/TestSecurityHeaders.java b/tests/club/wpia/gigi/TestSecurityHeaders.java similarity index 90% rename from tests/org/cacert/gigi/TestSecurityHeaders.java rename to tests/club/wpia/gigi/TestSecurityHeaders.java index 8149d322..d99b1703 100644 --- a/tests/org/cacert/gigi/TestSecurityHeaders.java +++ b/tests/club/wpia/gigi/TestSecurityHeaders.java @@ -1,13 +1,14 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; import java.io.IOException; import java.net.HttpURLConnection; -import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; +import club.wpia.gigi.testUtils.ManagedTest; + public class TestSecurityHeaders extends ManagedTest { @Test diff --git a/tests/org/cacert/gigi/TestSeparateSessionScope.java b/tests/club/wpia/gigi/TestSeparateSessionScope.java similarity index 91% rename from tests/org/cacert/gigi/TestSeparateSessionScope.java rename to tests/club/wpia/gigi/TestSeparateSessionScope.java index 9ace036e..c5bb9dce 100644 --- a/tests/org/cacert/gigi/TestSeparateSessionScope.java +++ b/tests/club/wpia/gigi/TestSeparateSessionScope.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; @@ -13,14 +13,15 @@ import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.sql.SQLException; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.Job; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.Job; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.testUtils.ManagedTest; + public class TestSeparateSessionScope extends ManagedTest { @Test diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/club/wpia/gigi/TestUser.java similarity index 90% rename from tests/org/cacert/gigi/TestUser.java rename to tests/club/wpia/gigi/TestUser.java index 4c22f813..8f5dbd33 100644 --- a/tests/org/cacert/gigi/TestUser.java +++ b/tests/club/wpia/gigi/TestUser.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; @@ -7,22 +7,23 @@ import java.sql.SQLException; import java.util.Arrays; import java.util.Locale; -import org.cacert.gigi.dbObjects.Assurance; -import org.cacert.gigi.dbObjects.Assurance.AssuranceType; -import org.cacert.gigi.dbObjects.Country; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.dbObjects.NamePart; -import org.cacert.gigi.dbObjects.NamePart.NamePartType; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.BusinessTest; -import org.cacert.gigi.util.DayDate; -import org.cacert.gigi.util.Notary; import org.hamcrest.CoreMatchers; import org.junit.Test; +import club.wpia.gigi.dbObjects.Assurance; +import club.wpia.gigi.dbObjects.Assurance.AssuranceType; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.NamePart; +import club.wpia.gigi.dbObjects.NamePart.NamePartType; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.testUtils.BusinessTest; +import club.wpia.gigi.util.DayDate; +import club.wpia.gigi.util.Notary; + public class TestUser extends BusinessTest { @Test diff --git a/tests/org/cacert/gigi/TestUserGroupMembership.java b/tests/club/wpia/gigi/TestUserGroupMembership.java similarity index 93% rename from tests/org/cacert/gigi/TestUserGroupMembership.java rename to tests/club/wpia/gigi/TestUserGroupMembership.java index 5ddf2d11..d0e7a2bf 100644 --- a/tests/org/cacert/gigi/TestUserGroupMembership.java +++ b/tests/club/wpia/gigi/TestUserGroupMembership.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -9,14 +9,15 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.ObjectCache; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.BusinessTest; import org.junit.Test; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.ObjectCache; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.testUtils.BusinessTest; + public class TestUserGroupMembership extends BusinessTest { private final Group ttpGroup = Group.TTP_ASSURER; diff --git a/tests/org/cacert/gigi/TestUserSerialize.java b/tests/club/wpia/gigi/TestUserSerialize.java similarity index 92% rename from tests/org/cacert/gigi/TestUserSerialize.java rename to tests/club/wpia/gigi/TestUserSerialize.java index 91c1dfd4..70a8b6fe 100644 --- a/tests/org/cacert/gigi/TestUserSerialize.java +++ b/tests/club/wpia/gigi/TestUserSerialize.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import static org.junit.Assert.*; @@ -8,10 +8,11 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.BusinessTest; import org.junit.Test; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.testUtils.BusinessTest; + public class TestUserSerialize extends BusinessTest { private byte[] serialize(Object o) throws IOException { diff --git a/tests/org/cacert/gigi/api/ImportCATSResult.java b/tests/club/wpia/gigi/api/ImportCATSResult.java similarity index 87% rename from tests/org/cacert/gigi/api/ImportCATSResult.java rename to tests/club/wpia/gigi/api/ImportCATSResult.java index a0caee2b..1d392500 100644 --- a/tests/org/cacert/gigi/api/ImportCATSResult.java +++ b/tests/club/wpia/gigi/api/ImportCATSResult.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import static org.junit.Assert.*; @@ -11,24 +11,27 @@ import java.security.GeneralSecurityException; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.CATS.CATSType; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.Certificate.SANType; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.RestrictedApiTest; -import org.cacert.gigi.util.ServerConstants; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.api.CATSImport; +import club.wpia.gigi.api.CATSResolve; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.CATS.CATSType; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.dbObjects.Certificate.SANType; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.RestrictedApiTest; +import club.wpia.gigi.util.ServerConstants; + public class ImportCATSResult extends RestrictedApiTest { @Test public void testLookupSerial() throws GigiApiException, IOException, GeneralSecurityException, InterruptedException { - Certificate target2 = new Certificate(u, u, Certificate.buildDN("EMAIL", u.getEmail()), Digest.SHA256, generatePEMCSR(generateKeypair(), "EMAIL=" + u.getEmail()), CSRType.CSR, CertificateProfile.getByName("client"), new Certificate.SubjectAlternateName(SANType.EMAIL, "cats@cacert.org")); + Certificate target2 = new Certificate(u, u, Certificate.buildDN("EMAIL", u.getEmail()), Digest.SHA256, generatePEMCSR(generateKeypair(), "EMAIL=" + u.getEmail()), CSRType.CSR, CertificateProfile.getByName("client"), new Certificate.SubjectAlternateName(SANType.EMAIL, "cats@example.com")); await(target2.issue(null, "2y", u)); target2.setLoginEnabled(true); diff --git a/tests/org/cacert/gigi/api/IssueCert.java b/tests/club/wpia/gigi/api/IssueCert.java similarity index 88% rename from tests/org/cacert/gigi/api/IssueCert.java rename to tests/club/wpia/gigi/api/IssueCert.java index 60dc286d..d5302f92 100644 --- a/tests/org/cacert/gigi/api/IssueCert.java +++ b/tests/club/wpia/gigi/api/IssueCert.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import static org.junit.Assert.*; @@ -15,20 +15,21 @@ import java.security.PrivateKey; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.dbObjects.Country; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.pages.account.certs.CertificateRequest; -import org.cacert.gigi.testUtils.ClientTest; -import org.cacert.gigi.testUtils.IOUtils; import org.junit.Test; +import club.wpia.gigi.api.CreateCertificate; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.pages.account.certs.CertificateRequest; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.testUtils.IOUtils; import sun.security.x509.X500Name; public class IssueCert extends ClientTest { diff --git a/tests/org/cacert/gigi/api/TestFindAgent.java b/tests/club/wpia/gigi/api/TestFindAgent.java similarity index 86% rename from tests/org/cacert/gigi/api/TestFindAgent.java rename to tests/club/wpia/gigi/api/TestFindAgent.java index 71bad946..cae8b812 100644 --- a/tests/org/cacert/gigi/api/TestFindAgent.java +++ b/tests/club/wpia/gigi/api/TestFindAgent.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.api; +package club.wpia.gigi.api; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -9,28 +9,30 @@ import java.net.HttpURLConnection; import java.security.GeneralSecurityException; import java.util.Arrays; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.Certificate.SANType; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.account.FindAgentAccess; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.RestrictedApiTest; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; import org.json.JSONArray; import org.json.JSONObject; import org.json.JSONTokener; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.api.FindAgent; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.dbObjects.Certificate.SANType; +import club.wpia.gigi.pages.account.FindAgentAccess; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.RestrictedApiTest; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; + public class TestFindAgent extends RestrictedApiTest { @Test public void testResolve() throws GigiApiException, IOException, GeneralSecurityException, InterruptedException { - Certificate target2 = new Certificate(u, u, Certificate.buildDN("EMAIL", u.getEmail()), Digest.SHA256, generatePEMCSR(generateKeypair(), "EMAIL=" + u.getEmail()), CSRType.CSR, CertificateProfile.getByName("client"), new Certificate.SubjectAlternateName(SANType.EMAIL, "cats@cacert.org")); + Certificate target2 = new Certificate(u, u, Certificate.buildDN("EMAIL", u.getEmail()), Digest.SHA256, generatePEMCSR(generateKeypair(), "EMAIL=" + u.getEmail()), CSRType.CSR, CertificateProfile.getByName("client"), new Certificate.SubjectAlternateName(SANType.EMAIL, "cats@example.com")); await(target2.issue(null, "2y", u)); HttpURLConnection v = doApi(FindAgent.PATH_RESOLVE, "serial=" + target2.getSerial().toLowerCase()); diff --git a/tests/org/cacert/gigi/crypto/TestSPKAC.java b/tests/club/wpia/gigi/crypto/TestSPKAC.java similarity index 96% rename from tests/org/cacert/gigi/crypto/TestSPKAC.java rename to tests/club/wpia/gigi/crypto/TestSPKAC.java index 3dd39a2d..7f72242b 100644 --- a/tests/org/cacert/gigi/crypto/TestSPKAC.java +++ b/tests/club/wpia/gigi/crypto/TestSPKAC.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.crypto; +package club.wpia.gigi.crypto; import static org.junit.Assert.*; @@ -12,9 +12,10 @@ import java.security.SignatureException; import java.security.interfaces.RSAKey; import java.util.Base64; -import org.cacert.gigi.testUtils.IOUtils; import org.junit.Test; +import club.wpia.gigi.crypto.SPKAC; +import club.wpia.gigi.testUtils.IOUtils; import sun.security.x509.X509Key; public class TestSPKAC { diff --git a/tests/org/cacert/gigi/crypto/sampleSPKAC.txt b/tests/club/wpia/gigi/crypto/sampleSPKAC.txt similarity index 100% rename from tests/org/cacert/gigi/crypto/sampleSPKAC.txt rename to tests/club/wpia/gigi/crypto/sampleSPKAC.txt diff --git a/tests/org/cacert/gigi/dbObjects/TestAssurance.java b/tests/club/wpia/gigi/dbObjects/TestAssurance.java similarity index 96% rename from tests/org/cacert/gigi/dbObjects/TestAssurance.java rename to tests/club/wpia/gigi/dbObjects/TestAssurance.java index 71c996d5..3906e601 100644 --- a/tests/org/cacert/gigi/dbObjects/TestAssurance.java +++ b/tests/club/wpia/gigi/dbObjects/TestAssurance.java @@ -1,18 +1,20 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import static org.junit.Assert.*; import java.io.IOException; import java.sql.Timestamp; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.testUtils.BusinessTest; -import org.cacert.gigi.util.DayDate; -import org.cacert.gigi.util.Notary; import org.junit.Before; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.testUtils.BusinessTest; +import club.wpia.gigi.util.DayDate; +import club.wpia.gigi.util.Notary; + public class TestAssurance extends BusinessTest { private final Timestamp yesterday = new Timestamp(System.currentTimeMillis() - DayDate.MILLI_DAY); diff --git a/tests/org/cacert/gigi/dbObjects/TestAssuranceMail.java b/tests/club/wpia/gigi/dbObjects/TestAssuranceMail.java similarity index 96% rename from tests/org/cacert/gigi/dbObjects/TestAssuranceMail.java rename to tests/club/wpia/gigi/dbObjects/TestAssuranceMail.java index 57fc997b..5efc69e8 100644 --- a/tests/org/cacert/gigi/dbObjects/TestAssuranceMail.java +++ b/tests/club/wpia/gigi/dbObjects/TestAssuranceMail.java @@ -1,20 +1,25 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import java.sql.Timestamp; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.dbObjects.Assurance.AssuranceType; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.dbObjects.NamePart.NamePartType; -import org.cacert.gigi.testUtils.BusinessTest; -import org.cacert.gigi.util.DayDate; -import org.cacert.gigi.util.Notary; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.NamePart; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Assurance.AssuranceType; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.dbObjects.NamePart.NamePartType; +import club.wpia.gigi.testUtils.BusinessTest; +import club.wpia.gigi.util.DayDate; +import club.wpia.gigi.util.Notary; + public class TestAssuranceMail extends BusinessTest { private User agent; diff --git a/tests/org/cacert/gigi/dbObjects/TestAssureName.java b/tests/club/wpia/gigi/dbObjects/TestAssureName.java similarity index 76% rename from tests/org/cacert/gigi/dbObjects/TestAssureName.java rename to tests/club/wpia/gigi/dbObjects/TestAssureName.java index c84bf483..4d902509 100644 --- a/tests/org/cacert/gigi/dbObjects/TestAssureName.java +++ b/tests/club/wpia/gigi/dbObjects/TestAssureName.java @@ -1,15 +1,20 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import static org.junit.Assert.*; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Assurance.AssuranceType; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.dbObjects.NamePart.NamePartType; -import org.cacert.gigi.testUtils.ClientBusinessTest; -import org.cacert.gigi.util.Notary; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.NamePart; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Assurance.AssuranceType; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.dbObjects.NamePart.NamePartType; +import club.wpia.gigi.testUtils.ClientBusinessTest; +import club.wpia.gigi.util.Notary; + public class TestAssureName extends ClientBusinessTest { @Test diff --git a/tests/org/cacert/gigi/dbObjects/TestCATS.java b/tests/club/wpia/gigi/dbObjects/TestCATS.java similarity index 90% rename from tests/org/cacert/gigi/dbObjects/TestCATS.java rename to tests/club/wpia/gigi/dbObjects/TestCATS.java index 50f1cbe4..87513e14 100644 --- a/tests/org/cacert/gigi/dbObjects/TestCATS.java +++ b/tests/club/wpia/gigi/dbObjects/TestCATS.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import static org.junit.Assert.*; @@ -6,10 +6,12 @@ import java.io.IOException; import java.security.GeneralSecurityException; import java.sql.Date; -import org.cacert.gigi.dbObjects.CATS.CATSType; -import org.cacert.gigi.testUtils.ClientBusinessTest; import org.junit.Test; +import club.wpia.gigi.dbObjects.CATS; +import club.wpia.gigi.dbObjects.CATS.CATSType; +import club.wpia.gigi.testUtils.ClientBusinessTest; + public class TestCATS extends ClientBusinessTest { /** diff --git a/tests/org/cacert/gigi/dbObjects/TestCertificate.java b/tests/club/wpia/gigi/dbObjects/TestCertificate.java similarity index 78% rename from tests/org/cacert/gigi/dbObjects/TestCertificate.java rename to tests/club/wpia/gigi/dbObjects/TestCertificate.java index 3b4a63b4..519bd59e 100644 --- a/tests/org/cacert/gigi/dbObjects/TestCertificate.java +++ b/tests/club/wpia/gigi/dbObjects/TestCertificate.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import static org.junit.Assert.*; @@ -6,11 +6,14 @@ import java.io.IOException; import java.security.GeneralSecurityException; import java.security.KeyPair; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.testUtils.ClientBusinessTest; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.testUtils.ClientBusinessTest; + public class TestCertificate extends ClientBusinessTest { @Test diff --git a/tests/org/cacert/gigi/dbObjects/TestCountryCode.java b/tests/club/wpia/gigi/dbObjects/TestCountryCode.java similarity index 92% rename from tests/org/cacert/gigi/dbObjects/TestCountryCode.java rename to tests/club/wpia/gigi/dbObjects/TestCountryCode.java index 7f82909c..1a9b1adf 100644 --- a/tests/org/cacert/gigi/dbObjects/TestCountryCode.java +++ b/tests/club/wpia/gigi/dbObjects/TestCountryCode.java @@ -1,13 +1,10 @@ -package org.cacert.gigi.dbObjects; +package club.wpia.gigi.dbObjects; import static org.junit.Assert.*; import java.util.Arrays; import java.util.List; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.testUtils.BusinessTest; import org.hamcrest.BaseMatcher; import org.hamcrest.CoreMatchers; import org.hamcrest.Description; @@ -18,6 +15,11 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.testUtils.BusinessTest; + @RunWith(Parameterized.class) public class TestCountryCode extends BusinessTest { diff --git a/tests/org/cacert/gigi/email/TestEmailProviderClass.java b/tests/club/wpia/gigi/email/TestEmailProviderClass.java similarity index 93% rename from tests/org/cacert/gigi/email/TestEmailProviderClass.java rename to tests/club/wpia/gigi/email/TestEmailProviderClass.java index 1ebb8117..a61be922 100644 --- a/tests/org/cacert/gigi/email/TestEmailProviderClass.java +++ b/tests/club/wpia/gigi/email/TestEmailProviderClass.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.email; +package club.wpia.gigi.email; import static org.junit.Assert.*; import static org.junit.Assume.*; @@ -14,10 +14,11 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import org.cacert.gigi.testUtils.ConfiguredTest; import org.junit.BeforeClass; import org.junit.Test; +import club.wpia.gigi.testUtils.ConfiguredTest; + public class TestEmailProviderClass extends ConfiguredTest { @Test @@ -47,7 +48,7 @@ public class TestEmailProviderClass extends ConfiguredTest { @BeforeClass public static void initMailsystem() throws NoSuchAlgorithmException, KeyManagementException { Properties prop = new Properties(); - prop.setProperty("emailProvider", "org.cacert.gigi.email.SendMail"); + prop.setProperty("emailProvider", "club.wpia.gigi.email.SendMail"); EmailProvider.initSystem(prop, null, null); SSLContext c = SSLContext.getInstance("TLS"); c.init(null, new TrustManager[] { diff --git a/tests/org/cacert/gigi/email/TestSendmail.java b/tests/club/wpia/gigi/email/TestSendmail.java similarity index 93% rename from tests/org/cacert/gigi/email/TestSendmail.java rename to tests/club/wpia/gigi/email/TestSendmail.java index d9af0a28..9f3358b9 100644 --- a/tests/org/cacert/gigi/email/TestSendmail.java +++ b/tests/club/wpia/gigi/email/TestSendmail.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.email; +package club.wpia.gigi.email; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -25,10 +25,10 @@ import java.util.Random; import javax.net.ssl.SSLSocketFactory; -import org.cacert.gigi.testUtils.ConfiguredTest; -import org.cacert.gigi.util.ServerConstants; import org.junit.Test; +import club.wpia.gigi.testUtils.ConfiguredTest; +import club.wpia.gigi.util.ServerConstants; import sun.security.x509.AlgorithmId; import sun.security.x509.CertificateAlgorithmId; import sun.security.x509.CertificateSerialNumber; @@ -55,7 +55,7 @@ public class TestSendmail extends ConfiguredTest { String subj = "subj-" + createUniqueName(); String msg = "msg-" + createUniqueName(); - EmailProvider.getInstance().sendMail(succmail, subj, msg, "system@cacert.org", "Testtarget", "Testsender", null, false); + EmailProvider.getInstance().sendMail(succmail, subj, msg, "system@wpia.club", "Testtarget", "Testsender", null, false); try (Socket s = SSLSocketFactory.getDefault().createSocket(imap, 993);// PrintWriter pw = new PrintWriter(new OutputStreamWriter(s.getOutputStream(), "UTF-8"), true);// @@ -86,7 +86,7 @@ public class TestSendmail extends ConfiguredTest { pw.println("log logout"); imapUntil(br, "log"); assertThat(body, containsString("From: " + ServerConstants.getSupportMailAddress())); - assertThat(body, containsString("To: gigi-testuser@dogcraft.de")); + assertThat(body, containsString("To: " + succmail)); assertThat(body, containsString("Subject: " + subj)); assertThat(body, containsString(Base64.getEncoder().encodeToString(msg.getBytes("UTF-8")))); @@ -110,7 +110,7 @@ public class TestSendmail extends ConfiguredTest { private void initSelfsign() throws GeneralSecurityException, CertificateException, IOException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException { assumeNotNull(getTestProps().getProperty("emailProvider.smtpHost"), getTestProps().getProperty("emailProvider.smtpPort")); Properties prop = new Properties(); - prop.setProperty("emailProvider", "org.cacert.gigi.email.SendMail"); + prop.setProperty("emailProvider", "club.wpia.gigi.email.SendMail"); prop.setProperty("emailProvider.smtpHost", getTestProps().getProperty("emailProvider.smtpHost")); prop.setProperty("emailProvider.smtpPort", getTestProps().getProperty("emailProvider.smtpPort")); KeyPair kp = generateKeypair(); @@ -120,7 +120,7 @@ public class TestSendmail extends ConfiguredTest { info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(rng.nextInt() & 0x7fffffff)); AlgorithmId algID = AlgorithmId.get("SHA256WithRSA"); info.set(X509CertInfo.ALGORITHM_ID, new CertificateAlgorithmId(algID)); - info.set(X509CertInfo.SUBJECT, new X500Name("EMAIL=system@cacert.org")); + info.set(X509CertInfo.SUBJECT, new X500Name("EMAIL=system@wpia.club")); info.set(X509CertInfo.KEY, new CertificateX509Key(kp.getPublic())); info.set(X509CertInfo.VALIDITY, new CertificateValidity(new Date(System.currentTimeMillis()), new Date(System.currentTimeMillis() + 60 * 60 * 1000))); info.set(X509CertInfo.ISSUER, new X500Name("CN=test-issue")); diff --git a/tests/org/cacert/gigi/pages/TestVerify.java b/tests/club/wpia/gigi/pages/TestVerify.java similarity index 90% rename from tests/org/cacert/gigi/pages/TestVerify.java rename to tests/club/wpia/gigi/pages/TestVerify.java index 28572eb3..d1b799b5 100644 --- a/tests/org/cacert/gigi/pages/TestVerify.java +++ b/tests/club/wpia/gigi/pages/TestVerify.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import static org.junit.Assert.*; @@ -6,13 +6,14 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.testUtils.ClientBusinessTest; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; import org.hamcrest.CustomMatcher; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.testUtils.ClientBusinessTest; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; + public class TestVerify extends ClientBusinessTest { @Test diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java b/tests/club/wpia/gigi/pages/account/TestCertificateAdd.java similarity index 97% rename from tests/org/cacert/gigi/pages/account/TestCertificateAdd.java rename to tests/club/wpia/gigi/pages/account/TestCertificateAdd.java index 2fc2f60e..9b3a7638 100644 --- a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java +++ b/tests/club/wpia/gigi/pages/account/TestCertificateAdd.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -30,16 +30,16 @@ import java.util.Vector; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.cacert.gigi.crypto.SPKAC; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.pages.account.certs.CertificateAdd; -import org.cacert.gigi.pages.account.certs.CertificateRequest; -import org.cacert.gigi.testUtils.ClientTest; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.util.PEM; import org.junit.Test; +import club.wpia.gigi.crypto.SPKAC; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.pages.account.certs.CertificateAdd; +import club.wpia.gigi.pages.account.certs.CertificateRequest; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.util.PEM; import sun.security.pkcs.PKCS7; import sun.security.pkcs.PKCS9Attribute; import sun.security.pkcs10.PKCS10Attribute; diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java b/tests/club/wpia/gigi/pages/account/TestCertificateRequest.java similarity index 90% rename from tests/org/cacert/gigi/pages/account/TestCertificateRequest.java rename to tests/club/wpia/gigi/pages/account/TestCertificateRequest.java index 0beaef87..52938183 100644 --- a/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java +++ b/tests/club/wpia/gigi/pages/account/TestCertificateRequest.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -7,13 +7,14 @@ import java.io.IOException; import java.security.GeneralSecurityException; import java.security.KeyPair; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.pages.account.certs.CertificateRequest; -import org.cacert.gigi.testUtils.ClientTest; -import org.cacert.gigi.util.AuthorizationContext; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.pages.account.certs.CertificateRequest; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.util.AuthorizationContext; + public class TestCertificateRequest extends ClientTest { KeyPair kp = generateKeypair(); diff --git a/tests/org/cacert/gigi/pages/account/TestChangePassword.java b/tests/club/wpia/gigi/pages/account/TestChangePassword.java similarity index 95% rename from tests/org/cacert/gigi/pages/account/TestChangePassword.java rename to tests/club/wpia/gigi/pages/account/TestChangePassword.java index 96018426..7a2a6a92 100644 --- a/tests/org/cacert/gigi/pages/account/TestChangePassword.java +++ b/tests/club/wpia/gigi/pages/account/TestChangePassword.java @@ -1,14 +1,16 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import static org.junit.Assert.*; import java.io.IOException; import java.net.URLEncoder; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.testUtils.ClientTest; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.pages.account.ChangePasswordPage; +import club.wpia.gigi.testUtils.ClientTest; + public class TestChangePassword extends ClientTest { String path = ChangePasswordPage.PATH; diff --git a/tests/org/cacert/gigi/pages/account/TestDomain.java b/tests/club/wpia/gigi/pages/account/TestDomain.java similarity index 89% rename from tests/org/cacert/gigi/pages/account/TestDomain.java rename to tests/club/wpia/gigi/pages/account/TestDomain.java index 49f1b85c..d4b12ed4 100644 --- a/tests/org/cacert/gigi/pages/account/TestDomain.java +++ b/tests/club/wpia/gigi/pages/account/TestDomain.java @@ -1,15 +1,16 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import static org.junit.Assert.*; import java.io.IOException; import java.net.URLEncoder; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.pages.account.domain.DomainOverview; -import org.cacert.gigi.testUtils.ClientTest; import org.junit.Test; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.pages.account.domain.DomainOverview; +import club.wpia.gigi.testUtils.ClientTest; + public class TestDomain extends ClientTest { public TestDomain() throws IOException {} diff --git a/tests/org/cacert/gigi/pages/account/TestMailManagement.java b/tests/club/wpia/gigi/pages/account/TestMailManagement.java similarity index 95% rename from tests/org/cacert/gigi/pages/account/TestMailManagement.java rename to tests/club/wpia/gigi/pages/account/TestMailManagement.java index fd4d4d49..84ad60de 100644 --- a/tests/org/cacert/gigi/pages/account/TestMailManagement.java +++ b/tests/club/wpia/gigi/pages/account/TestMailManagement.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import static org.junit.Assert.*; @@ -8,14 +8,15 @@ import java.net.MalformedURLException; import java.net.URLEncoder; import java.util.Locale; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.ObjectCache; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.account.mail.MailOverview; -import org.cacert.gigi.testUtils.ClientTest; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.ObjectCache; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.account.mail.MailOverview; +import club.wpia.gigi.testUtils.ClientTest; + public class TestMailManagement extends ClientTest { private String path = MailOverview.DEFAULT_PATH; diff --git a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java b/tests/club/wpia/gigi/pages/account/TestMyDetailsEdit.java similarity index 93% rename from tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java rename to tests/club/wpia/gigi/pages/account/TestMyDetailsEdit.java index 83597848..7f2a811f 100644 --- a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java +++ b/tests/club/wpia/gigi/pages/account/TestMyDetailsEdit.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import static org.junit.Assert.*; @@ -10,16 +10,18 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.TimeZone; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.dbObjects.NamePart; -import org.cacert.gigi.dbObjects.NamePart.NamePartType; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.ManagedTest; import org.hamcrest.CoreMatchers; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.NamePart; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.NamePart.NamePartType; +import club.wpia.gigi.pages.account.MyDetails; +import club.wpia.gigi.testUtils.ManagedTest; + public class TestMyDetailsEdit extends ManagedTest { String email = createUniqueName() + "@e.de"; diff --git a/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java b/tests/club/wpia/gigi/pages/account/TestPasswordResetExternal.java similarity index 88% rename from tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java rename to tests/club/wpia/gigi/pages/account/TestPasswordResetExternal.java index b00927b2..872fc746 100644 --- a/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java +++ b/tests/club/wpia/gigi/pages/account/TestPasswordResetExternal.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -12,15 +12,16 @@ import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.PasswordResetPage; -import org.cacert.gigi.pages.wot.TestAssurance; -import org.cacert.gigi.testUtils.ClientTest; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; -import org.cacert.gigi.util.RandomToken; import org.junit.Test; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.PasswordResetPage; +import club.wpia.gigi.pages.wot.TestAssurance; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; +import club.wpia.gigi.util.RandomToken; + public class TestPasswordResetExternal extends ClientTest { @Test diff --git a/tests/org/cacert/gigi/pages/account/TestTrainings.java b/tests/club/wpia/gigi/pages/account/TestTrainings.java similarity index 77% rename from tests/org/cacert/gigi/pages/account/TestTrainings.java rename to tests/club/wpia/gigi/pages/account/TestTrainings.java index 7a30a3dc..1c559574 100644 --- a/tests/org/cacert/gigi/pages/account/TestTrainings.java +++ b/tests/club/wpia/gigi/pages/account/TestTrainings.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package club.wpia.gigi.pages.account; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.*; @@ -7,13 +7,15 @@ import java.io.IOException; import java.security.GeneralSecurityException; import java.sql.Date; -import org.cacert.gigi.dbObjects.CATS; -import org.cacert.gigi.dbObjects.CATS.CATSType; -import org.cacert.gigi.testUtils.ClientTest; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.util.HTMLEncoder; import org.junit.Test; +import club.wpia.gigi.dbObjects.CATS; +import club.wpia.gigi.dbObjects.CATS.CATSType; +import club.wpia.gigi.pages.account.UserTrainings; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.util.HTMLEncoder; + public class TestTrainings extends ClientTest { public TestTrainings() throws GeneralSecurityException, IOException {} diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminNotificationMail.java b/tests/club/wpia/gigi/pages/admin/TestSEAdminNotificationMail.java similarity index 93% rename from tests/org/cacert/gigi/pages/admin/TestSEAdminNotificationMail.java rename to tests/club/wpia/gigi/pages/admin/TestSEAdminNotificationMail.java index f025b0f6..8a439a31 100644 --- a/tests/org/cacert/gigi/pages/admin/TestSEAdminNotificationMail.java +++ b/tests/club/wpia/gigi/pages/admin/TestSEAdminNotificationMail.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin; +package club.wpia.gigi.pages.admin; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -11,17 +11,18 @@ import java.net.URLEncoder; import java.util.HashMap; import java.util.Locale; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage; -import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage; -import org.cacert.gigi.testUtils.ClientTest; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; -import org.cacert.gigi.util.ServerConstants; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.pages.admin.support.SupportEnterTicketPage; +import club.wpia.gigi.pages.admin.support.SupportUserDetailsPage; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; +import club.wpia.gigi.util.ServerConstants; + public class TestSEAdminNotificationMail extends ClientTest { private int targetID; diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageDetails.java similarity index 91% rename from tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java rename to tests/club/wpia/gigi/pages/admin/TestSEAdminPageDetails.java index e9b31abb..5a458a28 100644 --- a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java +++ b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageDetails.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin; +package club.wpia.gigi.pages.admin; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -11,20 +11,21 @@ import java.sql.Timestamp; import java.util.Locale; import java.util.regex.Pattern; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.ObjectCache; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.account.History; -import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage; -import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage; -import org.cacert.gigi.testUtils.ClientTest; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.util.DayDate; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.ObjectCache; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.account.History; +import club.wpia.gigi.pages.admin.support.SupportEnterTicketPage; +import club.wpia.gigi.pages.admin.support.SupportUserDetailsPage; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.util.DayDate; + public class TestSEAdminPageDetails extends ClientTest { public TestSEAdminPageDetails() throws IOException, GigiApiException { diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java similarity index 84% rename from tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java rename to tests/club/wpia/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java index 57c5c15c..f662532f 100644 --- a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java +++ b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin; +package club.wpia.gigi.pages.admin; import static org.junit.Assert.*; import static org.junit.Assume.*; @@ -9,18 +9,19 @@ import java.net.MalformedURLException; import java.net.URLConnection; import java.net.URLEncoder; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.admin.support.FindUserByDomainPage; -import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage; -import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage; -import org.cacert.gigi.testUtils.ClientTest; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.util.ServerConstants; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.admin.support.FindUserByDomainPage; +import club.wpia.gigi.pages.admin.support.SupportEnterTicketPage; +import club.wpia.gigi.pages.admin.support.SupportUserDetailsPage; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.util.ServerConstants; + public class TestSEAdminPageUserDomainSearch extends ClientTest { private Domain d; diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserMailSearch.java b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageUserMailSearch.java similarity index 94% rename from tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserMailSearch.java rename to tests/club/wpia/gigi/pages/admin/TestSEAdminPageUserMailSearch.java index 29918b5a..831deed6 100644 --- a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserMailSearch.java +++ b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageUserMailSearch.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin; +package club.wpia.gigi.pages.admin; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -9,17 +9,18 @@ import java.net.MalformedURLException; import java.net.URLConnection; import java.net.URLEncoder; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.admin.support.FindUserByEmailPage; -import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage; -import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage; -import org.cacert.gigi.testUtils.ClientTest; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.util.ServerConstants; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.admin.support.FindUserByEmailPage; +import club.wpia.gigi.pages.admin.support.SupportEnterTicketPage; +import club.wpia.gigi.pages.admin.support.SupportUserDetailsPage; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.util.ServerConstants; + public class TestSEAdminPageUserMailSearch extends ClientTest { public TestSEAdminPageUserMailSearch() throws IOException, GigiApiException { diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminTicketSetting.java b/tests/club/wpia/gigi/pages/admin/TestSEAdminTicketSetting.java similarity index 75% rename from tests/org/cacert/gigi/pages/admin/TestSEAdminTicketSetting.java rename to tests/club/wpia/gigi/pages/admin/TestSEAdminTicketSetting.java index 01e17b3c..59f04279 100644 --- a/tests/org/cacert/gigi/pages/admin/TestSEAdminTicketSetting.java +++ b/tests/club/wpia/gigi/pages/admin/TestSEAdminTicketSetting.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.admin; +package club.wpia.gigi.pages.admin; import static org.junit.Assert.*; @@ -6,14 +6,15 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.pages.admin.support.FindUserByDomainPage; -import org.cacert.gigi.pages.admin.support.FindUserByEmailPage; -import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage; -import org.cacert.gigi.testUtils.ClientTest; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.pages.admin.support.FindUserByDomainPage; +import club.wpia.gigi.pages.admin.support.FindUserByEmailPage; +import club.wpia.gigi.pages.admin.support.SupportEnterTicketPage; +import club.wpia.gigi.testUtils.ClientTest; + public class TestSEAdminTicketSetting extends ClientTest { public TestSEAdminTicketSetting() throws IOException, GigiApiException { diff --git a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java b/tests/club/wpia/gigi/pages/main/RegisterPageTest.java similarity index 95% rename from tests/org/cacert/gigi/pages/main/RegisterPageTest.java rename to tests/club/wpia/gigi/pages/main/RegisterPageTest.java index 9fb61830..aee9ad5b 100644 --- a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java +++ b/tests/club/wpia/gigi/pages/main/RegisterPageTest.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.main; +package club.wpia.gigi.pages.main; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -11,12 +11,13 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.regex.Pattern; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.InitTruststore; -import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Before; import org.junit.Test; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.testUtils.InitTruststore; +import club.wpia.gigi.testUtils.ManagedTest; + public class RegisterPageTest extends ManagedTest { static { @@ -155,10 +156,10 @@ public class RegisterPageTest extends ManagedTest { @Test public void testDataStays() throws IOException { long uniq = System.currentTimeMillis(); - String run = runRegister("fname=fn" + uniq + "&lname=ln" + uniq + "&email=ma" + uniq + "@cacert.org&pword1=pas" + uniq + "&pword2=pas2" + uniq + "&day=28&month=10&year=1950"); + String run = runRegister("fname=fn" + uniq + "&lname=ln" + uniq + "&email=ma" + uniq + "@example.com&pword1=pas" + uniq + "&pword2=pas2" + uniq + "&day=28&month=10&year=1950"); assertThat(run, containsString("fn" + uniq)); assertThat(run, containsString("ln" + uniq)); - assertThat(run, containsString("ma" + uniq + "@cacert.org")); + assertThat(run, containsString("ma" + uniq + "@example.com")); assertThat(run, not(containsString("pas" + uniq))); assertThat(run, not(containsString("pas2" + uniq))); // test year @@ -186,9 +187,9 @@ public class RegisterPageTest extends ManagedTest { @Test public void testDoubleMail() throws IOException { long uniq = System.currentTimeMillis(); - registerUser("RegisterTest", "User", "testmail" + uniq + "@cacert.org", TEST_PASSWORD); + registerUser("RegisterTest", "User", "testmail" + uniq + "@example.com", TEST_PASSWORD); try { - registerUser("RegisterTest", "User", "testmail" + uniq + "@cacert.org", TEST_PASSWORD); + registerUser("RegisterTest", "User", "testmail" + uniq + "@example.com", TEST_PASSWORD); throw new Error("Registering a user with the same email needs to fail."); } catch (AssertionError e) { @@ -200,7 +201,7 @@ public class RegisterPageTest extends ManagedTest { getMailReceiver().setApproveRegex(Pattern.compile("a")); long uniq = System.currentTimeMillis(); try { - registerUser("RegisterTest", "User", "testInvalidMailbox" + uniq + "@cacert.org", TEST_PASSWORD); + registerUser("RegisterTest", "User", "testInvalidMailbox" + uniq + "@example.com", TEST_PASSWORD); throw new Error("Registering a user with invalid mailbox must fail."); } catch (AssertionError e) { diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgDomain.java b/tests/club/wpia/gigi/pages/orga/TestOrgDomain.java similarity index 92% rename from tests/org/cacert/gigi/pages/orga/TestOrgDomain.java rename to tests/club/wpia/gigi/pages/orga/TestOrgDomain.java index b24bb83e..c758b7c6 100644 --- a/tests/org/cacert/gigi/pages/orga/TestOrgDomain.java +++ b/tests/club/wpia/gigi/pages/orga/TestOrgDomain.java @@ -1,16 +1,18 @@ -package org.cacert.gigi.pages.orga; +package club.wpia.gigi.pages.orga; import static org.junit.Assert.*; import java.io.IOException; import java.net.URLEncoder; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.testUtils.OrgTest; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.pages.orga.ViewOrgPage; +import club.wpia.gigi.testUtils.OrgTest; + public class TestOrgDomain extends OrgTest { public TestOrgDomain() throws IOException, GigiApiException { diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java b/tests/club/wpia/gigi/pages/orga/TestOrgManagement.java similarity index 95% rename from tests/org/cacert/gigi/pages/orga/TestOrgManagement.java rename to tests/club/wpia/gigi/pages/orga/TestOrgManagement.java index 523ce88b..a6cd5754 100644 --- a/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java +++ b/tests/club/wpia/gigi/pages/orga/TestOrgManagement.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.orga; +package club.wpia.gigi.pages.orga; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -12,18 +12,21 @@ import java.net.URLEncoder; import java.sql.SQLException; import java.util.List; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Country; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.Organisation.Affiliation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.account.MyDetails; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.OrgTest; import org.junit.After; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.dbObjects.Organisation.Affiliation; +import club.wpia.gigi.pages.account.MyDetails; +import club.wpia.gigi.pages.orga.CreateOrgPage; +import club.wpia.gigi.pages.orga.ViewOrgPage; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.OrgTest; + public class TestOrgManagement extends OrgTest { public TestOrgManagement() throws IOException, GigiApiException { diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/club/wpia/gigi/pages/wot/TestAssurance.java similarity index 95% rename from tests/org/cacert/gigi/pages/wot/TestAssurance.java rename to tests/club/wpia/gigi/pages/wot/TestAssurance.java index 0af859cc..20ebe100 100644 --- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java +++ b/tests/club/wpia/gigi/pages/wot/TestAssurance.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.wot; +package club.wpia.gigi.pages.wot; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -16,21 +16,24 @@ import java.util.Calendar; import java.util.Date; import java.util.regex.Pattern; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.dbObjects.Country; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.account.MyDetails; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.ManagedTest; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; -import org.cacert.gigi.util.DayDate; -import org.cacert.gigi.util.Notary; import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.account.MyDetails; +import club.wpia.gigi.pages.wot.AssurePage; +import club.wpia.gigi.pages.wot.Points; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.ManagedTest; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; +import club.wpia.gigi.util.DayDate; +import club.wpia.gigi.util.Notary; + public class TestAssurance extends ManagedTest { private String assurerM; @@ -44,8 +47,8 @@ public class TestAssurance extends ManagedTest { @Before public void setup() throws IOException { clearCaches(); - assurerM = createUniqueName() + "@cacert-test.org"; - assureeM = createUniqueName() + "@cacert-test.org"; + assurerM = createUniqueName() + "@example.org"; + assureeM = createUniqueName() + "@example.org"; createAssuranceUser("a", "b", assurerM, TEST_PASSWORD); int assureeId = createVerifiedUser("a", "c", assureeM, TEST_PASSWORD); diff --git a/tests/org/cacert/gigi/pages/wot/TestTTP.java b/tests/club/wpia/gigi/pages/wot/TestTTP.java similarity index 77% rename from tests/org/cacert/gigi/pages/wot/TestTTP.java rename to tests/club/wpia/gigi/pages/wot/TestTTP.java index 560d1b56..c0a966fc 100644 --- a/tests/org/cacert/gigi/pages/wot/TestTTP.java +++ b/tests/club/wpia/gigi/pages/wot/TestTTP.java @@ -1,18 +1,20 @@ -package org.cacert.gigi.pages.wot; +package club.wpia.gigi.pages.wot; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import java.io.IOException; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.ObjectCache; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.ClientTest; -import org.cacert.gigi.testUtils.IOUtils; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.ObjectCache; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.wot.RequestTTPPage; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.testUtils.IOUtils; + public class TestTTP extends ClientTest { public TestTTP() throws IOException {} diff --git a/tests/org/cacert/gigi/pages/wot/TestTTPAdmin.java b/tests/club/wpia/gigi/pages/wot/TestTTPAdmin.java similarity index 85% rename from tests/org/cacert/gigi/pages/wot/TestTTPAdmin.java rename to tests/club/wpia/gigi/pages/wot/TestTTPAdmin.java index 12430b7c..2e3c3862 100644 --- a/tests/org/cacert/gigi/pages/wot/TestTTPAdmin.java +++ b/tests/club/wpia/gigi/pages/wot/TestTTPAdmin.java @@ -1,17 +1,18 @@ -package org.cacert.gigi.pages.wot; +package club.wpia.gigi.pages.wot; import static org.junit.Assert.*; import java.io.IOException; import java.net.MalformedURLException; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.admin.TTPAdminPage; -import org.cacert.gigi.testUtils.ClientTest; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.admin.TTPAdminPage; +import club.wpia.gigi.testUtils.ClientTest; + public class TestTTPAdmin extends ClientTest { User us2; diff --git a/tests/org/cacert/gigi/ping/TestDNS.java b/tests/club/wpia/gigi/ping/TestDNS.java similarity index 91% rename from tests/org/cacert/gigi/ping/TestDNS.java rename to tests/club/wpia/gigi/ping/TestDNS.java index 96d9f438..4285e8bd 100644 --- a/tests/org/cacert/gigi/ping/TestDNS.java +++ b/tests/club/wpia/gigi/ping/TestDNS.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.ping; +package club.wpia.gigi.ping; import static org.junit.Assert.*; import static org.junit.Assume.*; @@ -11,14 +11,15 @@ import java.util.regex.Pattern; import javax.naming.NamingException; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.PingTest; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; -import org.cacert.gigi.util.DNSUtil; -import org.cacert.gigi.util.RandomToken; -import org.cacert.gigi.util.SystemKeywords; import org.junit.Test; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.PingTest; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; +import club.wpia.gigi.util.DNSUtil; +import club.wpia.gigi.util.RandomToken; +import club.wpia.gigi.util.SystemKeywords; + public class TestDNS extends PingTest { @Test diff --git a/tests/org/cacert/gigi/ping/TestHTTP.java b/tests/club/wpia/gigi/ping/TestHTTP.java similarity index 93% rename from tests/org/cacert/gigi/ping/TestHTTP.java rename to tests/club/wpia/gigi/ping/TestHTTP.java index 748305e9..8dc041f6 100644 --- a/tests/org/cacert/gigi/ping/TestHTTP.java +++ b/tests/club/wpia/gigi/ping/TestHTTP.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.ping; +package club.wpia.gigi.ping; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -19,17 +19,18 @@ import java.util.regex.Pattern; import javax.naming.NamingException; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.DomainPingConfiguration; -import org.cacert.gigi.dbObjects.DomainPingType; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.PingTest; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; -import org.cacert.gigi.util.RandomToken; -import org.cacert.gigi.util.SystemKeywords; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.DomainPingConfiguration; +import club.wpia.gigi.dbObjects.DomainPingType; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.PingTest; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; +import club.wpia.gigi.util.RandomToken; +import club.wpia.gigi.util.SystemKeywords; + public class TestHTTP extends PingTest { @Test diff --git a/tests/org/cacert/gigi/ping/TestSSL.java b/tests/club/wpia/gigi/ping/TestSSL.java similarity index 94% rename from tests/org/cacert/gigi/ping/TestSSL.java rename to tests/club/wpia/gigi/ping/TestSSL.java index e0c78bd0..9b93c77d 100644 --- a/tests/org/cacert/gigi/ping/TestSSL.java +++ b/tests/club/wpia/gigi/ping/TestSSL.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.ping; +package club.wpia.gigi.ping; import static org.junit.Assert.*; import static org.junit.Assume.*; @@ -35,25 +35,26 @@ import javax.net.ssl.X509KeyManager; import javax.net.ssl.X509TrustManager; import javax.security.auth.x500.X500Principal; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.DatabaseConnection; -import org.cacert.gigi.database.DatabaseConnection.Link; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.Job; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.PingTest; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; -import org.cacert.gigi.util.SimpleSigner; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.DatabaseConnection; +import club.wpia.gigi.database.DatabaseConnection.Link; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.Job; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.testUtils.IOUtils; +import club.wpia.gigi.testUtils.PingTest; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; +import club.wpia.gigi.util.SimpleSigner; + @RunWith(Parameterized.class) public class TestSSL extends PingTest { diff --git a/tests/org/cacert/gigi/template/TestTemplate.java b/tests/club/wpia/gigi/template/TestTemplate.java similarity index 93% rename from tests/org/cacert/gigi/template/TestTemplate.java rename to tests/club/wpia/gigi/template/TestTemplate.java index 82aad931..3da413ad 100644 --- a/tests/org/cacert/gigi/template/TestTemplate.java +++ b/tests/club/wpia/gigi/template/TestTemplate.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.template; +package club.wpia.gigi.template; import static org.junit.Assert.*; @@ -9,15 +9,16 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.HashAlgorithms; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.OutputableArrayIterable; -import org.cacert.gigi.output.template.Template; import org.junit.Test; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.HashAlgorithms; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.OutputableArrayIterable; +import club.wpia.gigi.output.template.Template; + public class TestTemplate { private String testExecute(Language l, HashMap vars, String input) { diff --git a/tests/org/cacert/gigi/template/TestTemplateMail.java b/tests/club/wpia/gigi/template/TestTemplateMail.java similarity index 87% rename from tests/org/cacert/gigi/template/TestTemplateMail.java rename to tests/club/wpia/gigi/template/TestTemplateMail.java index fb610dc2..c6607140 100644 --- a/tests/org/cacert/gigi/template/TestTemplateMail.java +++ b/tests/club/wpia/gigi/template/TestTemplateMail.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.template; +package club.wpia.gigi.template; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -8,12 +8,13 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Locale; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.MailTemplate; -import org.cacert.gigi.testUtils.BusinessTest; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; import org.junit.Test; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.MailTemplate; +import club.wpia.gigi.testUtils.BusinessTest; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; + public class TestTemplateMail extends BusinessTest { private static final String TEST_MAIL = "test@mail.com"; diff --git a/tests/org/cacert/gigi/template/TestTemplateUnescaped.java b/tests/club/wpia/gigi/template/TestTemplateUnescaped.java similarity index 88% rename from tests/org/cacert/gigi/template/TestTemplateUnescaped.java rename to tests/club/wpia/gigi/template/TestTemplateUnescaped.java index 8c8a5683..4c8ae414 100644 --- a/tests/org/cacert/gigi/template/TestTemplateUnescaped.java +++ b/tests/club/wpia/gigi/template/TestTemplateUnescaped.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.template; +package club.wpia.gigi.template; import static org.junit.Assert.*; @@ -9,11 +9,12 @@ import java.util.Collections; import java.util.HashMap; import java.util.Locale; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Outputable; -import org.cacert.gigi.output.template.Template; import org.junit.Test; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Outputable; +import club.wpia.gigi.output.template.Template; + public class TestTemplateUnescaped { private String testExecute(HashMap vars, String input) { diff --git a/tests/org/cacert/gigi/testUtils/BusinessTest.java b/tests/club/wpia/gigi/testUtils/BusinessTest.java similarity index 90% rename from tests/org/cacert/gigi/testUtils/BusinessTest.java rename to tests/club/wpia/gigi/testUtils/BusinessTest.java index ad0b1e1f..d62713a6 100644 --- a/tests/org/cacert/gigi/testUtils/BusinessTest.java +++ b/tests/club/wpia/gigi/testUtils/BusinessTest.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; import static org.junit.Assert.*; @@ -14,20 +14,21 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.NamePart; -import org.cacert.gigi.dbObjects.NamePart.NamePartType; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.email.EmailProvider; -import org.cacert.gigi.ping.PingerDaemon; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; -import org.cacert.gigi.util.DayDate; import org.junit.BeforeClass; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.NamePart; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.NamePart.NamePartType; +import club.wpia.gigi.email.EmailProvider; +import club.wpia.gigi.ping.PingerDaemon; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; +import club.wpia.gigi.util.DayDate; + public abstract class BusinessTest extends ConfiguredTest { public static class InVMEmail extends EmailProvider implements MailReceiver { diff --git a/tests/org/cacert/gigi/testUtils/ClientBusinessTest.java b/tests/club/wpia/gigi/testUtils/ClientBusinessTest.java similarity index 74% rename from tests/org/cacert/gigi/testUtils/ClientBusinessTest.java rename to tests/club/wpia/gigi/testUtils/ClientBusinessTest.java index 31c28686..023d55ed 100644 --- a/tests/org/cacert/gigi/testUtils/ClientBusinessTest.java +++ b/tests/club/wpia/gigi/testUtils/ClientBusinessTest.java @@ -1,8 +1,8 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.dbObjects.User; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.User; public class ClientBusinessTest extends BusinessTest { diff --git a/tests/org/cacert/gigi/testUtils/ClientTest.java b/tests/club/wpia/gigi/testUtils/ClientTest.java similarity index 94% rename from tests/org/cacert/gigi/testUtils/ClientTest.java rename to tests/club/wpia/gigi/testUtils/ClientTest.java index 923fd97a..1cd12d26 100644 --- a/tests/org/cacert/gigi/testUtils/ClientTest.java +++ b/tests/club/wpia/gigi/testUtils/ClientTest.java @@ -1,9 +1,9 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; import java.io.IOException; import java.net.HttpURLConnection; -import org.cacert.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.User; /** * Superclass for testsuites in a scenario where there is an registered member, diff --git a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java b/tests/club/wpia/gigi/testUtils/ConfiguredTest.java similarity index 90% rename from tests/org/cacert/gigi/testUtils/ConfiguredTest.java rename to tests/club/wpia/gigi/testUtils/ConfiguredTest.java index c3d67b9a..bf50d611 100644 --- a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java +++ b/tests/club/wpia/gigi/testUtils/ConfiguredTest.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; import static org.junit.Assert.*; @@ -22,27 +22,27 @@ import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.DatabaseConnection; -import org.cacert.gigi.database.DatabaseConnection.Link; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.SQLFileManager.ImportType; -import org.cacert.gigi.dbObjects.CATS.CATSType; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.DomainPingType; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; -import org.cacert.gigi.util.DatabaseManager; -import org.cacert.gigi.util.DomainAssessment; -import org.cacert.gigi.util.Notary; -import org.cacert.gigi.util.PEM; -import org.cacert.gigi.util.PasswordHash; -import org.cacert.gigi.util.ServerConstants; -import org.cacert.gigi.util.TimeConditions; import org.junit.AfterClass; import org.junit.BeforeClass; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.DatabaseConnection; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.DatabaseConnection.Link; +import club.wpia.gigi.database.SQLFileManager.ImportType; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.DomainPingType; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.CATS.CATSType; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; +import club.wpia.gigi.util.DatabaseManager; +import club.wpia.gigi.util.DomainAssessment; +import club.wpia.gigi.util.Notary; +import club.wpia.gigi.util.PEM; +import club.wpia.gigi.util.PasswordHash; +import club.wpia.gigi.util.ServerConstants; +import club.wpia.gigi.util.TimeConditions; import sun.security.pkcs10.PKCS10; import sun.security.pkcs10.PKCS10Attributes; import sun.security.x509.X500Name; diff --git a/tests/org/cacert/gigi/testUtils/IOUtils.java b/tests/club/wpia/gigi/testUtils/IOUtils.java similarity index 98% rename from tests/org/cacert/gigi/testUtils/IOUtils.java rename to tests/club/wpia/gigi/testUtils/IOUtils.java index 61cd1784..f35c1a47 100644 --- a/tests/org/cacert/gigi/testUtils/IOUtils.java +++ b/tests/club/wpia/gigi/testUtils/IOUtils.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; import java.io.ByteArrayOutputStream; import java.io.CharArrayWriter; diff --git a/tests/org/cacert/gigi/testUtils/InitTruststore.java b/tests/club/wpia/gigi/testUtils/InitTruststore.java similarity index 88% rename from tests/org/cacert/gigi/testUtils/InitTruststore.java rename to tests/club/wpia/gigi/testUtils/InitTruststore.java index 1207df93..b91b3ffe 100644 --- a/tests/org/cacert/gigi/testUtils/InitTruststore.java +++ b/tests/club/wpia/gigi/testUtils/InitTruststore.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; public class InitTruststore { diff --git a/tests/org/cacert/gigi/testUtils/MailReceiver.java b/tests/club/wpia/gigi/testUtils/MailReceiver.java similarity index 70% rename from tests/org/cacert/gigi/testUtils/MailReceiver.java rename to tests/club/wpia/gigi/testUtils/MailReceiver.java index 99a88864..4d1bc104 100644 --- a/tests/org/cacert/gigi/testUtils/MailReceiver.java +++ b/tests/club/wpia/gigi/testUtils/MailReceiver.java @@ -1,8 +1,8 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; import java.util.regex.Pattern; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; public interface MailReceiver { diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/club/wpia/gigi/testUtils/ManagedTest.java similarity index 96% rename from tests/org/cacert/gigi/testUtils/ManagedTest.java rename to tests/club/wpia/gigi/testUtils/ManagedTest.java index dda6736d..25749221 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/club/wpia/gigi/testUtils/ManagedTest.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; import static org.junit.Assert.*; @@ -33,24 +33,25 @@ import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; import javax.net.ssl.X509KeyManager; -import org.cacert.gigi.DevelLauncher; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Job; -import org.cacert.gigi.dbObjects.ObjectCache; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.account.MyDetails; -import org.cacert.gigi.pages.main.RegisterPage; -import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; -import org.cacert.gigi.util.SimpleSigner; import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; +import club.wpia.gigi.DevelLauncher; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Job; +import club.wpia.gigi.dbObjects.ObjectCache; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.pages.account.MyDetails; +import club.wpia.gigi.pages.main.RegisterPage; +import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; +import club.wpia.gigi.util.SimpleSigner; + /** * Base class for test suites who require a launched Gigi instance. The instance * is cleared once per test suite. @@ -181,7 +182,7 @@ public class ManagedTest extends ConfiguredTest { mainProps.setProperty("testrunner", "true"); mainProps.setProperty("host", "127.0.0.1"); - mainProps.setProperty("emailProvider", "org.cacert.gigi.email.TestEmailProvider"); + mainProps.setProperty("emailProvider", "club.wpia.gigi.email.TestEmailProvider"); mainProps.setProperty("emailProvider.port", "8473"); mainProps.setProperty("sql.driver", testProps.getProperty("sql.driver")); mainProps.setProperty("sql.url", testProps.getProperty("sql.url")); diff --git a/tests/org/cacert/gigi/testUtils/OrgTest.java b/tests/club/wpia/gigi/testUtils/OrgTest.java similarity index 68% rename from tests/org/cacert/gigi/testUtils/OrgTest.java rename to tests/club/wpia/gigi/testUtils/OrgTest.java index 5a42a4a6..e7360fe2 100644 --- a/tests/org/cacert/gigi/testUtils/OrgTest.java +++ b/tests/club/wpia/gigi/testUtils/OrgTest.java @@ -1,12 +1,12 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; import java.io.IOException; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Country; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Organisation; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; public class OrgTest extends ClientTest { diff --git a/tests/org/cacert/gigi/testUtils/PingTest.java b/tests/club/wpia/gigi/testUtils/PingTest.java similarity index 92% rename from tests/org/cacert/gigi/testUtils/PingTest.java rename to tests/club/wpia/gigi/testUtils/PingTest.java index a432cb2a..87ea982f 100644 --- a/tests/org/cacert/gigi/testUtils/PingTest.java +++ b/tests/club/wpia/gigi/testUtils/PingTest.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; import static org.junit.Assert.*; import static org.junit.Assume.*; @@ -12,12 +12,13 @@ import java.sql.SQLException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.pages.account.domain.DomainOverview; -import org.cacert.gigi.util.SystemKeywords; import org.junit.After; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.pages.account.domain.DomainOverview; +import club.wpia.gigi.util.SystemKeywords; + /** * Base class for test suites that check extensively if the domain-ping * functionality wroks as expected. diff --git a/tests/org/cacert/gigi/testUtils/RegisteredUser.java b/tests/club/wpia/gigi/testUtils/RegisteredUser.java similarity index 90% rename from tests/org/cacert/gigi/testUtils/RegisteredUser.java rename to tests/club/wpia/gigi/testUtils/RegisteredUser.java index a5b51728..a5d7aeb8 100644 --- a/tests/org/cacert/gigi/testUtils/RegisteredUser.java +++ b/tests/club/wpia/gigi/testUtils/RegisteredUser.java @@ -1,10 +1,11 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; -import org.cacert.gigi.dbObjects.User; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; +import club.wpia.gigi.dbObjects.User; + public class RegisteredUser implements TestRule { User u; diff --git a/tests/org/cacert/gigi/testUtils/RestrictedApiTest.java b/tests/club/wpia/gigi/testUtils/RestrictedApiTest.java similarity index 79% rename from tests/org/cacert/gigi/testUtils/RestrictedApiTest.java rename to tests/club/wpia/gigi/testUtils/RestrictedApiTest.java index 4fbfc4f0..a96414fa 100644 --- a/tests/org/cacert/gigi/testUtils/RestrictedApiTest.java +++ b/tests/club/wpia/gigi/testUtils/RestrictedApiTest.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; import static org.junit.Assert.*; @@ -11,20 +11,21 @@ import java.security.KeyPair; import java.security.PrivateKey; import java.security.cert.X509Certificate; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.Certificate.SANType; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.Country; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.util.ServerConstants; import org.junit.BeforeClass; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Organisation; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.dbObjects.Certificate.SANType; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.util.ServerConstants; + public class RestrictedApiTest extends ClientTest { protected static PrivateKey pk; @@ -45,7 +46,7 @@ public class RestrictedApiTest extends ClientTest { grant(u, Group.ORGASSURER); clearCaches(); u = User.getById(u.getId()); - selfOrg = new Organisation(Organisation.SELF_ORG_NAME, Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS), "NA", "NA", "contact@cacert.org", "", "", u); + selfOrg = new Organisation(Organisation.SELF_ORG_NAME, Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS), "NA", "NA", "contact@example.org", "", "", u); assertTrue(selfOrg.isSelfOrganisation()); KeyPair kp = generateKeypair(); String key1 = generatePEMCSR(kp, "EMAIL=" + ServerConstants.getQuizMailAddress()); diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java b/tests/club/wpia/gigi/testUtils/TestEmailReceiver.java similarity index 98% rename from tests/org/cacert/gigi/testUtils/TestEmailReceiver.java rename to tests/club/wpia/gigi/testUtils/TestEmailReceiver.java index 155539c7..01dbe78e 100644 --- a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java +++ b/tests/club/wpia/gigi/testUtils/TestEmailReceiver.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.testUtils; +package club.wpia.gigi.testUtils; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -12,8 +12,8 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.cacert.gigi.email.EmailProvider; -import org.cacert.gigi.email.TestEmailProvider; +import club.wpia.gigi.email.EmailProvider; +import club.wpia.gigi.email.TestEmailProvider; /** * This class reveives emails from the current system under test. It is the diff --git a/tests/org/cacert/gigi/util/EditDistanceTest.java b/tests/club/wpia/gigi/util/EditDistanceTest.java similarity index 96% rename from tests/org/cacert/gigi/util/EditDistanceTest.java rename to tests/club/wpia/gigi/util/EditDistanceTest.java index b3331627..0d11be90 100644 --- a/tests/org/cacert/gigi/util/EditDistanceTest.java +++ b/tests/club/wpia/gigi/util/EditDistanceTest.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import static org.junit.Assert.*; @@ -12,6 +12,8 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; +import club.wpia.gigi.util.EditDistance; + @RunWith(Parameterized.class) public class EditDistanceTest { diff --git a/tests/org/cacert/gigi/util/TestCAAValidation.java b/tests/club/wpia/gigi/util/TestCAAValidation.java similarity index 81% rename from tests/org/cacert/gigi/util/TestCAAValidation.java rename to tests/club/wpia/gigi/util/TestCAAValidation.java index b483a68f..b1db8b60 100644 --- a/tests/org/cacert/gigi/util/TestCAAValidation.java +++ b/tests/club/wpia/gigi/util/TestCAAValidation.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -8,21 +8,24 @@ import java.io.IOException; import java.security.GeneralSecurityException; import java.util.Arrays; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.Job; -import org.cacert.gigi.pages.account.certs.CertificateRequest; -import org.cacert.gigi.testUtils.ClientTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.Job; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.pages.account.certs.CertificateRequest; +import club.wpia.gigi.testUtils.ClientTest; +import club.wpia.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.CAA; + @RunWith(Parameterized.class) public class TestCAAValidation extends ClientTest { diff --git a/tests/org/cacert/gigi/util/TestHTMLEncoder.java b/tests/club/wpia/gigi/util/TestHTMLEncoder.java similarity index 90% rename from tests/org/cacert/gigi/util/TestHTMLEncoder.java rename to tests/club/wpia/gigi/util/TestHTMLEncoder.java index 5d3a2aed..92eddab0 100644 --- a/tests/org/cacert/gigi/util/TestHTMLEncoder.java +++ b/tests/club/wpia/gigi/util/TestHTMLEncoder.java @@ -1,9 +1,11 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import static org.junit.Assert.*; import org.junit.Test; +import club.wpia.gigi.util.HTMLEncoder; + public class TestHTMLEncoder { @Test diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/club/wpia/gigi/util/TestNotary.java similarity index 91% rename from tests/org/cacert/gigi/util/TestNotary.java rename to tests/club/wpia/gigi/util/TestNotary.java index 27c22d2e..6733dd63 100644 --- a/tests/org/cacert/gigi/util/TestNotary.java +++ b/tests/club/wpia/gigi/util/TestNotary.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import static org.junit.Assert.*; @@ -6,23 +6,25 @@ import java.io.IOException; import java.sql.SQLException; import java.util.Date; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.dbObjects.Assurance.AssuranceType; -import org.cacert.gigi.dbObjects.CATS; -import org.cacert.gigi.dbObjects.CATS.CATSType; -import org.cacert.gigi.dbObjects.Country; -import org.cacert.gigi.dbObjects.Country.CountryCodeType; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.Name; -import org.cacert.gigi.dbObjects.NamePart; -import org.cacert.gigi.dbObjects.NamePart.NamePartType; -import org.cacert.gigi.dbObjects.ObjectCache; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.output.DateSelector; -import org.cacert.gigi.testUtils.BusinessTest; import org.junit.Test; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.dbObjects.CATS; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.Name; +import club.wpia.gigi.dbObjects.NamePart; +import club.wpia.gigi.dbObjects.ObjectCache; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Assurance.AssuranceType; +import club.wpia.gigi.dbObjects.CATS.CATSType; +import club.wpia.gigi.dbObjects.Country.CountryCodeType; +import club.wpia.gigi.dbObjects.NamePart.NamePartType; +import club.wpia.gigi.output.DateSelector; +import club.wpia.gigi.testUtils.BusinessTest; +import club.wpia.gigi.util.Notary; + public class TestNotary extends BusinessTest { public final Country DE = Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS); diff --git a/tests/org/cacert/gigi/util/TestPasswordHash.java b/tests/club/wpia/gigi/util/TestPasswordHash.java similarity index 90% rename from tests/org/cacert/gigi/util/TestPasswordHash.java rename to tests/club/wpia/gigi/util/TestPasswordHash.java index 6e38a2bd..b865afe4 100644 --- a/tests/org/cacert/gigi/util/TestPasswordHash.java +++ b/tests/club/wpia/gigi/util/TestPasswordHash.java @@ -1,9 +1,11 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import static org.junit.Assert.*; import org.junit.Test; +import club.wpia.gigi.util.PasswordHash; + public class TestPasswordHash { @Test diff --git a/tests/org/cacert/gigi/util/TestPasswordMigration.java b/tests/club/wpia/gigi/util/TestPasswordMigration.java similarity index 80% rename from tests/org/cacert/gigi/util/TestPasswordMigration.java rename to tests/club/wpia/gigi/util/TestPasswordMigration.java index 7ff4ea6d..17544a0b 100644 --- a/tests/org/cacert/gigi/util/TestPasswordMigration.java +++ b/tests/club/wpia/gigi/util/TestPasswordMigration.java @@ -1,17 +1,19 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import java.io.IOException; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.testUtils.ManagedTest; -import org.cacert.gigi.testUtils.RegisteredUser; import org.junit.Rule; import org.junit.Test; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.testUtils.ManagedTest; +import club.wpia.gigi.testUtils.RegisteredUser; +import club.wpia.gigi.util.PasswordHash; + public class TestPasswordMigration extends ManagedTest { @Rule diff --git a/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java b/tests/club/wpia/gigi/util/TestPasswordStrengthChecker.java similarity index 93% rename from tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java rename to tests/club/wpia/gigi/util/TestPasswordStrengthChecker.java index 94c60591..16e2cbbd 100644 --- a/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java +++ b/tests/club/wpia/gigi/util/TestPasswordStrengthChecker.java @@ -1,10 +1,12 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import static org.junit.Assert.*; -import org.cacert.gigi.testUtils.ClientBusinessTest; import org.junit.Test; +import club.wpia.gigi.testUtils.ClientBusinessTest; +import club.wpia.gigi.util.PasswordStrengthChecker; + public class TestPasswordStrengthChecker extends ClientBusinessTest { String e = "email"; diff --git a/tests/org/cacert/gigi/util/TestPublicSuffixes.java b/tests/club/wpia/gigi/util/TestPublicSuffixes.java similarity index 97% rename from tests/org/cacert/gigi/util/TestPublicSuffixes.java rename to tests/club/wpia/gigi/util/TestPublicSuffixes.java index 95022415..a4847eb4 100644 --- a/tests/org/cacert/gigi/util/TestPublicSuffixes.java +++ b/tests/club/wpia/gigi/util/TestPublicSuffixes.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import static org.junit.Assert.*; @@ -14,6 +14,8 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; +import club.wpia.gigi.util.PublicSuffixes; + @RunWith(Parameterized.class) public class TestPublicSuffixes { diff --git a/tests/org/cacert/gigi/util/TestPublicSuffixes.txt b/tests/club/wpia/gigi/util/TestPublicSuffixes.txt similarity index 100% rename from tests/org/cacert/gigi/util/TestPublicSuffixes.txt rename to tests/club/wpia/gigi/util/TestPublicSuffixes.txt diff --git a/util-testing/org/cacert/gigi/DevelLauncher.java b/util-testing/club/wpia/gigi/DevelLauncher.java similarity index 93% rename from util-testing/org/cacert/gigi/DevelLauncher.java rename to util-testing/club/wpia/gigi/DevelLauncher.java index 0fe53454..69a47ec4 100644 --- a/util-testing/org/cacert/gigi/DevelLauncher.java +++ b/util-testing/club/wpia/gigi/DevelLauncher.java @@ -1,6 +1,6 @@ -package org.cacert.gigi; +package club.wpia.gigi; -import static org.cacert.gigi.Gigi.*; +import static club.wpia.gigi.Gigi.*; import java.awt.Desktop; import java.io.BufferedReader; @@ -9,7 +9,6 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.lang.reflect.Field; @@ -27,21 +26,22 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.cacert.gigi.dbObjects.ObjectCache; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.output.template.TranslateCommand; -import org.cacert.gigi.pages.LoginPage; -import org.cacert.gigi.pages.Page; -import org.cacert.gigi.pages.account.certs.CertificateRequest; -import org.cacert.gigi.pages.main.RegisterPage; -import org.cacert.gigi.util.AuthorizationContext; -import org.cacert.gigi.util.ServerConstants; import org.kamranzafar.jtar.TarEntry; import org.kamranzafar.jtar.TarHeader; import org.kamranzafar.jtar.TarOutputStream; +import club.wpia.gigi.dbObjects.ObjectCache; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.output.template.TranslateCommand; +import club.wpia.gigi.pages.LoginPage; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.pages.account.certs.CertificateRequest; +import club.wpia.gigi.pages.main.RegisterPage; +import club.wpia.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.ServerConstants; + public class DevelLauncher { public static void main(String[] args) throws Exception { diff --git a/util-testing/org/cacert/gigi/DevelTicketWait.templ b/util-testing/club/wpia/gigi/DevelTicketWait.templ similarity index 100% rename from util-testing/org/cacert/gigi/DevelTicketWait.templ rename to util-testing/club/wpia/gigi/DevelTicketWait.templ diff --git a/util-testing/org/cacert/gigi/GenerateProfileOverview.java b/util-testing/club/wpia/gigi/GenerateProfileOverview.java similarity index 94% rename from util-testing/org/cacert/gigi/GenerateProfileOverview.java rename to util-testing/club/wpia/gigi/GenerateProfileOverview.java index 99d45e2e..f47d3c0c 100644 --- a/util-testing/org/cacert/gigi/GenerateProfileOverview.java +++ b/util-testing/club/wpia/gigi/GenerateProfileOverview.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; import java.awt.Desktop; import java.io.File; @@ -11,9 +11,9 @@ import java.util.LinkedList; import java.util.Properties; import java.util.TreeSet; -import org.cacert.gigi.database.DatabaseConnection; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.CertificateProfile.PropertyTemplate; +import club.wpia.gigi.database.DatabaseConnection; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.CertificateProfile.PropertyTemplate; public class GenerateProfileOverview { diff --git a/util-testing/org/cacert/gigi/TestLauncher.java b/util-testing/club/wpia/gigi/TestLauncher.java similarity index 91% rename from util-testing/org/cacert/gigi/TestLauncher.java rename to util-testing/club/wpia/gigi/TestLauncher.java index 89fc9e23..872eae54 100644 --- a/util-testing/org/cacert/gigi/TestLauncher.java +++ b/util-testing/club/wpia/gigi/TestLauncher.java @@ -1,4 +1,4 @@ -package org.cacert.gigi; +package club.wpia.gigi; public class TestLauncher { diff --git a/util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java b/util-testing/club/wpia/gigi/email/CommandlineEmailProvider.java similarity index 92% rename from util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java rename to util-testing/club/wpia/gigi/email/CommandlineEmailProvider.java index 263b4c49..f6cc4fc9 100644 --- a/util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java +++ b/util-testing/club/wpia/gigi/email/CommandlineEmailProvider.java @@ -1,8 +1,10 @@ -package org.cacert.gigi.email; +package club.wpia.gigi.email; import java.io.IOException; import java.util.Properties; +import club.wpia.gigi.email.EmailProvider; + public class CommandlineEmailProvider extends EmailProvider { public CommandlineEmailProvider(Properties p) {} diff --git a/util-testing/org/cacert/gigi/email/DelegateMailProvider.java b/util-testing/club/wpia/gigi/email/DelegateMailProvider.java similarity index 94% rename from util-testing/org/cacert/gigi/email/DelegateMailProvider.java rename to util-testing/club/wpia/gigi/email/DelegateMailProvider.java index 109aae8d..1196f861 100644 --- a/util-testing/org/cacert/gigi/email/DelegateMailProvider.java +++ b/util-testing/club/wpia/gigi/email/DelegateMailProvider.java @@ -1,10 +1,12 @@ -package org.cacert.gigi.email; +package club.wpia.gigi.email; import java.io.IOException; import java.security.Key; import java.security.cert.Certificate; import java.util.Properties; +import club.wpia.gigi.email.EmailProvider; + public abstract class DelegateMailProvider extends EmailProvider { private EmailProvider target; diff --git a/util-testing/org/cacert/gigi/email/TestEmailProvider.java b/util-testing/club/wpia/gigi/email/TestEmailProvider.java similarity index 99% rename from util-testing/org/cacert/gigi/email/TestEmailProvider.java rename to util-testing/club/wpia/gigi/email/TestEmailProvider.java index eb5eb820..92eb8067 100644 --- a/util-testing/org/cacert/gigi/email/TestEmailProvider.java +++ b/util-testing/club/wpia/gigi/email/TestEmailProvider.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.email; +package club.wpia.gigi.email; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/util-testing/org/cacert/gigi/localisation/FileIterable.java b/util-testing/club/wpia/gigi/localisation/FileIterable.java similarity index 97% rename from util-testing/org/cacert/gigi/localisation/FileIterable.java rename to util-testing/club/wpia/gigi/localisation/FileIterable.java index 33a9cade..410c610d 100644 --- a/util-testing/org/cacert/gigi/localisation/FileIterable.java +++ b/util-testing/club/wpia/gigi/localisation/FileIterable.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.localisation; +package club.wpia.gigi.localisation; import java.io.BufferedReader; import java.io.File; diff --git a/util-testing/org/cacert/gigi/localisation/TaintSource.java b/util-testing/club/wpia/gigi/localisation/TaintSource.java similarity index 99% rename from util-testing/org/cacert/gigi/localisation/TaintSource.java rename to util-testing/club/wpia/gigi/localisation/TaintSource.java index f17485e1..792d8d70 100644 --- a/util-testing/org/cacert/gigi/localisation/TaintSource.java +++ b/util-testing/club/wpia/gigi/localisation/TaintSource.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.localisation; +package club.wpia.gigi.localisation; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/util-testing/org/cacert/gigi/localisation/TranslationCollectingVisitor.java b/util-testing/club/wpia/gigi/localisation/TranslationCollectingVisitor.java similarity index 98% rename from util-testing/org/cacert/gigi/localisation/TranslationCollectingVisitor.java rename to util-testing/club/wpia/gigi/localisation/TranslationCollectingVisitor.java index a7b69418..ab3719a6 100644 --- a/util-testing/org/cacert/gigi/localisation/TranslationCollectingVisitor.java +++ b/util-testing/club/wpia/gigi/localisation/TranslationCollectingVisitor.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.localisation; +package club.wpia.gigi.localisation; import java.io.File; import java.io.IOException; @@ -163,7 +163,7 @@ public final class TranslationCollectingVisitor extends ASTVisitor { if (e instanceof MessageSend) { MessageSend m2 = (MessageSend) e; TaintSource ts = new TaintSource(m2.binding); - if (ts.equals(new TaintSource("org.cacert.gigi.pages", "Page", "getTitle()", 0))) { + if (ts.equals(new TaintSource("club.wpia.gigi.pages", "Page", "getTitle()", 0))) { return; } if (m2.receiver.resolvedType.isCompatibleWith(scope.getJavaLangEnum())) { diff --git a/util-testing/org/cacert/gigi/localisation/TranslationCollector.java b/util-testing/club/wpia/gigi/localisation/TranslationCollector.java similarity index 97% rename from util-testing/org/cacert/gigi/localisation/TranslationCollector.java rename to util-testing/club/wpia/gigi/localisation/TranslationCollector.java index 9b4f2a9f..44df294e 100644 --- a/util-testing/org/cacert/gigi/localisation/TranslationCollector.java +++ b/util-testing/club/wpia/gigi/localisation/TranslationCollector.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.localisation; +package club.wpia.gigi.localisation; import java.io.File; import java.io.FileInputStream; @@ -15,7 +15,8 @@ import java.util.LinkedList; import java.util.List; import java.util.TreeSet; -import org.cacert.gigi.output.template.Template; +import club.wpia.gigi.output.template.Template; + import org.eclipse.jdt.core.compiler.CategorizedProblem; import org.eclipse.jdt.internal.compiler.CompilationResult; import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; @@ -113,7 +114,7 @@ public class TranslationCollector { private void scanCode(LinkedList taint) throws Error { PrintWriter out = new PrintWriter(System.err); Main m = new Main(out, out, false, null, null); - File[] fs = recurse(new File(new File(new File(base, "src"), "org"), "cacert"), new LinkedList(), ".java").toArray(new File[0]); + File[] fs = recurse(new File(new File(new File(base, "src"), "club"), "wpia"), new LinkedList(), ".java").toArray(new File[0]); String[] t = new String[fs.length + 3]; t[0] = "-cp"; t[1] = new File(base, "bin").getAbsolutePath(); @@ -207,7 +208,7 @@ public class TranslationCollector { } private void scanTemplates() throws UnsupportedEncodingException, FileNotFoundException { - File[] ts = recurse(new File(new File(new File(base, "src"), "org"), "cacert"), new LinkedList(), ".templ").toArray(new File[0]); + File[] ts = recurse(new File(new File(new File(base, "src"), "club"), "wpia"), new LinkedList(), ".templ").toArray(new File[0]); for (File file : ts) { Template t = new Template(new InputStreamReader(new FileInputStream(file), "UTF-8")); LinkedList i = new LinkedList(); diff --git a/util-testing/club/wpia/gigi/localisation/conf.txt b/util-testing/club/wpia/gigi/localisation/conf.txt new file mode 100644 index 00000000..e889b96e --- /dev/null +++ b/util-testing/club/wpia/gigi/localisation/conf.txt @@ -0,0 +1,21 @@ +club.wpia.gigi.localisation Language.getTranslation(String),0 +club.wpia.gigi.pages Page.translate(ServletRequest, String),1 +club.wpia.gigi.output.template Form.outputError(PrintWriter, ServletRequest, String, Object[]),2 +club.wpia.gigi Gigi.MenuBuilder.putPage(String, Page, String),2 +club.wpia.gigi Gigi.MenuBuilder.getMenu(String),0 +club.wpia.gigi GigiApiException.GigiApiException(String),0=>club.wpia.gigi GigiApiException.formatPlain(PrintWriter),0 +club.wpia.gigi.output Menu.Menu(String),0=>club.wpia.gigi.output Menu.output(PrintWriter, Language, Map),0 +club.wpia.gigi.output SimpleMenuItem.SimpleMenuItem(String, String),1=>club.wpia.gigi.output SimpleMenuItem.printContent(PrintWriter, Language),0 +club.wpia.gigi.dbObjects Digest.Digest(String),0 +club.wpia.gigi.dbObjects Certificate.CertificateStatus.CertificateStatus(String),0 +club.wpia.gigi.pages Page.Page(String),0 +club.wpia.gigi.pages OneFormPage.OneFormPage(String, Class),0 +club.wpia.gigi.pages StaticPage.StaticPage(String, InputStream),0 +club.wpia.gigi.output.template SprintfCommand.SprintfCommand(String, List),0=>club.wpia.gigi.output.template SprintfCommand.output(PrintWriter, Language, Map),0 +club.wpia.gigi.output.template SprintfCom---invalid---mand.SprintfCommand(String),0=>club.wpia.gigi.output.template Template.parseCommand(String, ParseContext),0 +club.wpia.gigi.output.template TranslateCommand.TranslateCommand(String),0=>club.wpia.gigi.output.template TranslateCommand.output(PrintWriter, Language, Map),0 +club.wpia.gigi.pages.account.domain DomainOverview.DomainOverview(String),0 +club.wpia.gigi.dbObjects Group.Group(String, String, boolean, boolean, boolean),1 +club.wpia.gigi.output.template SprintfCommand.createSimple(String, Object[]),0 +club.wpia.gigi.pages ManagedFormPage.ManagedFormPage(String, Class),0 +club.wpia.gigi.pages ManagedMultiFormPage.ManagedMultiFormPage(String),0 diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/club/wpia/gigi/pages/Manager.java similarity index 92% rename from util-testing/org/cacert/gigi/pages/Manager.java rename to util-testing/club/wpia/gigi/pages/Manager.java index 38b45f6e..af05ab49 100644 --- a/util-testing/org/cacert/gigi/pages/Manager.java +++ b/util-testing/club/wpia/gigi/pages/Manager.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages; +package club.wpia.gigi.pages; import java.io.IOException; import java.io.PrintWriter; @@ -27,37 +27,37 @@ import java.util.regex.Pattern; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.Gigi; -import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.crypto.SPKAC; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.dbObjects.Assurance.AssuranceType; -import org.cacert.gigi.dbObjects.CATS; -import org.cacert.gigi.dbObjects.CATS.CATSType; -import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; -import org.cacert.gigi.dbObjects.CertificateOwner; -import org.cacert.gigi.dbObjects.Country; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.DomainPingType; -import org.cacert.gigi.dbObjects.EmailAddress; -import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.dbObjects.NamePart; -import org.cacert.gigi.dbObjects.NamePart.NamePartType; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.email.DelegateMailProvider; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.template.IterableDataset; -import org.cacert.gigi.output.template.Template; -import org.cacert.gigi.pages.account.certs.CertificateRequest; -import org.cacert.gigi.ping.DomainPinger; -import org.cacert.gigi.ping.PingerDaemon; -import org.cacert.gigi.util.AuthorizationContext; -import org.cacert.gigi.util.DayDate; -import org.cacert.gigi.util.Notary; -import org.cacert.gigi.util.TimeConditions; - +import club.wpia.gigi.Gigi; +import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.crypto.SPKAC; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.dbObjects.CATS; +import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.CertificateOwner; +import club.wpia.gigi.dbObjects.Country; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.DomainPingType; +import club.wpia.gigi.dbObjects.EmailAddress; +import club.wpia.gigi.dbObjects.Group; +import club.wpia.gigi.dbObjects.NamePart; +import club.wpia.gigi.dbObjects.User; +import club.wpia.gigi.dbObjects.Assurance.AssuranceType; +import club.wpia.gigi.dbObjects.CATS.CATSType; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.dbObjects.NamePart.NamePartType; +import club.wpia.gigi.email.DelegateMailProvider; +import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.IterableDataset; +import club.wpia.gigi.output.template.Template; +import club.wpia.gigi.pages.Page; +import club.wpia.gigi.pages.account.certs.CertificateRequest; +import club.wpia.gigi.ping.DomainPinger; +import club.wpia.gigi.ping.PingerDaemon; +import club.wpia.gigi.util.AuthorizationContext; +import club.wpia.gigi.util.DayDate; +import club.wpia.gigi.util.Notary; +import club.wpia.gigi.util.TimeConditions; import sun.security.x509.X509Key; public class Manager extends Page { diff --git a/util-testing/org/cacert/gigi/pages/Manager.templ b/util-testing/club/wpia/gigi/pages/Manager.templ similarity index 100% rename from util-testing/org/cacert/gigi/pages/Manager.templ rename to util-testing/club/wpia/gigi/pages/Manager.templ diff --git a/util-testing/org/cacert/gigi/pages/ManagerMails.templ b/util-testing/club/wpia/gigi/pages/ManagerMails.templ similarity index 100% rename from util-testing/org/cacert/gigi/pages/ManagerMails.templ rename to util-testing/club/wpia/gigi/pages/ManagerMails.templ diff --git a/util-testing/org/cacert/gigi/util/IOUtils.java b/util-testing/club/wpia/gigi/util/IOUtils.java similarity index 98% rename from util-testing/org/cacert/gigi/util/IOUtils.java rename to util-testing/club/wpia/gigi/util/IOUtils.java index c5dbd8db..1a98a845 100644 --- a/util-testing/org/cacert/gigi/util/IOUtils.java +++ b/util-testing/club/wpia/gigi/util/IOUtils.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.ByteArrayOutputStream; import java.io.CharArrayWriter; diff --git a/util-testing/org/cacert/gigi/util/SimpleSigner.java b/util-testing/club/wpia/gigi/util/SimpleSigner.java similarity index 97% rename from util-testing/org/cacert/gigi/util/SimpleSigner.java rename to util-testing/club/wpia/gigi/util/SimpleSigner.java index f2b97d7b..99feda23 100644 --- a/util-testing/org/cacert/gigi/util/SimpleSigner.java +++ b/util-testing/club/wpia/gigi/util/SimpleSigner.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.File; import java.io.FileInputStream; @@ -39,18 +39,19 @@ import java.util.TimeZone; import javax.security.auth.x500.X500Principal; -import org.cacert.gigi.crypto.SPKAC; -import org.cacert.gigi.database.DatabaseConnection; -import org.cacert.gigi.database.DatabaseConnection.Link; -import org.cacert.gigi.database.GigiPreparedStatement; -import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.Certificate.SANType; -import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.output.DateSelector; - +import club.wpia.gigi.crypto.SPKAC; +import club.wpia.gigi.database.DatabaseConnection; +import club.wpia.gigi.database.GigiPreparedStatement; +import club.wpia.gigi.database.GigiResultSet; +import club.wpia.gigi.database.DatabaseConnection.Link; +import club.wpia.gigi.dbObjects.CertificateProfile; +import club.wpia.gigi.dbObjects.Digest; +import club.wpia.gigi.dbObjects.Certificate.CSRType; +import club.wpia.gigi.dbObjects.Certificate.SANType; +import club.wpia.gigi.dbObjects.Certificate.SubjectAlternateName; +import club.wpia.gigi.output.DateSelector; +import club.wpia.gigi.util.KeyStorage; +import club.wpia.gigi.util.PEM; import sun.security.pkcs10.PKCS10; import sun.security.util.DerOutputStream; import sun.security.util.DerValue; diff --git a/util-testing/org/cacert/gigi/localisation/conf.txt b/util-testing/org/cacert/gigi/localisation/conf.txt deleted file mode 100644 index 30694f09..00000000 --- a/util-testing/org/cacert/gigi/localisation/conf.txt +++ /dev/null @@ -1,21 +0,0 @@ -org.cacert.gigi.localisation Language.getTranslation(String),0 -org.cacert.gigi.pages Page.translate(ServletRequest, String),1 -org.cacert.gigi.output.template Form.outputError(PrintWriter, ServletRequest, String, Object[]),2 -org.cacert.gigi Gigi.MenuBuilder.putPage(String, Page, String),2 -org.cacert.gigi Gigi.MenuBuilder.getMenu(String),0 -org.cacert.gigi GigiApiException.GigiApiException(String),0=>org.cacert.gigi GigiApiException.formatPlain(PrintWriter),0 -org.cacert.gigi.output Menu.Menu(String),0=>org.cacert.gigi.output Menu.output(PrintWriter, Language, Map),0 -org.cacert.gigi.output SimpleMenuItem.SimpleMenuItem(String, String),1=>org.cacert.gigi.output SimpleMenuItem.printContent(PrintWriter, Language),0 -org.cacert.gigi.dbObjects Digest.Digest(String),0 -org.cacert.gigi.dbObjects Certificate.CertificateStatus.CertificateStatus(String),0 -org.cacert.gigi.pages Page.Page(String),0 -org.cacert.gigi.pages OneFormPage.OneFormPage(String, Class),0 -org.cacert.gigi.pages StaticPage.StaticPage(String, InputStream),0 -org.cacert.gigi.output.template SprintfCommand.SprintfCommand(String, List),0=>org.cacert.gigi.output.template SprintfCommand.output(PrintWriter, Language, Map),0 -org.cacert.gigi.output.template SprintfCom---invalid---mand.SprintfCommand(String),0=>org.cacert.gigi.output.template Template.parseCommand(String, ParseContext),0 -org.cacert.gigi.output.template TranslateCommand.TranslateCommand(String),0=>org.cacert.gigi.output.template TranslateCommand.output(PrintWriter, Language, Map),0 -org.cacert.gigi.pages.account.domain DomainOverview.DomainOverview(String),0 -org.cacert.gigi.dbObjects Group.Group(String, String, boolean, boolean, boolean),1 -org.cacert.gigi.output.template SprintfCommand.createSimple(String, Object[]),0 -org.cacert.gigi.pages ManagedFormPage.ManagedFormPage(String, Class),0 -org.cacert.gigi.pages ManagedMultiFormPage.ManagedMultiFormPage(String),0 diff --git a/util/org/cacert/gigi/util/DatabaseManager.java b/util/club/wpia/gigi/util/DatabaseManager.java similarity index 93% rename from util/org/cacert/gigi/util/DatabaseManager.java rename to util/club/wpia/gigi/util/DatabaseManager.java index a6626b74..8628103b 100644 --- a/util/org/cacert/gigi/util/DatabaseManager.java +++ b/util/club/wpia/gigi/util/DatabaseManager.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.File; import java.io.FileInputStream; @@ -12,9 +12,9 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Properties; -import org.cacert.gigi.database.DatabaseConnection; -import org.cacert.gigi.database.SQLFileManager; -import org.cacert.gigi.database.SQLFileManager.ImportType; +import club.wpia.gigi.database.DatabaseConnection; +import club.wpia.gigi.database.SQLFileManager; +import club.wpia.gigi.database.SQLFileManager.ImportType; public class DatabaseManager { diff --git a/util/org/cacert/gigi/util/FetchLocales.java b/util/club/wpia/gigi/util/FetchLocales.java similarity index 99% rename from util/org/cacert/gigi/util/FetchLocales.java rename to util/club/wpia/gigi/util/FetchLocales.java index 0b61dcca..8cd55e49 100644 --- a/util/org/cacert/gigi/util/FetchLocales.java +++ b/util/club/wpia/gigi/util/FetchLocales.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.File; import java.io.FileNotFoundException; diff --git a/util/org/cacert/gigi/util/HighFinancialValueFetcher.java b/util/club/wpia/gigi/util/HighFinancialValueFetcher.java similarity index 98% rename from util/org/cacert/gigi/util/HighFinancialValueFetcher.java rename to util/club/wpia/gigi/util/HighFinancialValueFetcher.java index abac278d..84d80feb 100644 --- a/util/org/cacert/gigi/util/HighFinancialValueFetcher.java +++ b/util/club/wpia/gigi/util/HighFinancialValueFetcher.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.BufferedReader; import java.io.File; diff --git a/util/org/cacert/gigi/util/HighFinancialValueFetcherAlexa.java b/util/club/wpia/gigi/util/HighFinancialValueFetcherAlexa.java similarity index 94% rename from util/org/cacert/gigi/util/HighFinancialValueFetcherAlexa.java rename to util/club/wpia/gigi/util/HighFinancialValueFetcherAlexa.java index 17c91825..ae3ef536 100644 --- a/util/org/cacert/gigi/util/HighFinancialValueFetcherAlexa.java +++ b/util/club/wpia/gigi/util/HighFinancialValueFetcherAlexa.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.File; import java.io.PrintWriter; diff --git a/util/org/cacert/gigi/util/HighFinancialValueFetcherUmbrella.java b/util/club/wpia/gigi/util/HighFinancialValueFetcherUmbrella.java similarity index 96% rename from util/org/cacert/gigi/util/HighFinancialValueFetcherUmbrella.java rename to util/club/wpia/gigi/util/HighFinancialValueFetcherUmbrella.java index ef96a0fe..321c3df4 100644 --- a/util/org/cacert/gigi/util/HighFinancialValueFetcherUmbrella.java +++ b/util/club/wpia/gigi/util/HighFinancialValueFetcherUmbrella.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.util; +package club.wpia.gigi.util; import java.io.File; import java.io.PrintWriter; -- 2.39.2