]> WPIA git - gigi.git/commitdiff
upd: rename package name and all references to it
authorFelix Dörre <felix@dogcraft.de>
Wed, 15 Feb 2017 20:49:02 +0000 (21:49 +0100)
committerFelix Dörre <felix@dogcraft.de>
Thu, 16 Feb 2017 22:30:53 +0000 (23:30 +0100)
Change-Id: Ie1e938a864ad93732201643f42a83148dd2f137d

412 files changed:
.classpath
.gitignore
build.xml
config/gigi.properties.template
debian/.gitignore
debian/changelog
debian/control
debian/copyright
debian/gigi-proxy.service
debian/gigi-simple-signer.service
debian/gigi-standalone.service
debian/gigi.1
debian/rules
debian/wpia-gigi-testing.docs [moved from debian/cacert-gigi-testing.docs with 100% similarity]
debian/wpia-gigi-testing.gigi-simple-signer.init [moved from debian/cacert-gigi-testing.gigi-simple-signer.init with 100% similarity]
debian/wpia-gigi-testing.gigi-standalone.init [moved from debian/cacert-gigi-testing.gigi-standalone.init with 100% similarity]
debian/wpia-gigi-testing.install [moved from debian/cacert-gigi-testing.install with 100% similarity]
debian/wpia-gigi-testing.manpages [moved from debian/cacert-gigi-testing.manpages with 100% similarity]
debian/wpia-gigi-testing.postinst [moved from debian/cacert-gigi-testing.postinst with 93% similarity]
debian/wpia-gigi-testing.templates [moved from debian/cacert-gigi-testing.templates with 69% similarity]
debian/wpia-gigi-testing.wpia-gigi-signer.default [moved from debian/cacert-gigi-testing.cacert-gigi-signer.default with 100% similarity]
debian/wpia-gigi-testing.wpia-gigi.default [moved from debian/cacert-gigi-testing.cacert-gigi.default with 100% similarity]
debian/wpia-gigi.docs [moved from debian/cacert-gigi.docs with 100% similarity]
debian/wpia-gigi.gigi-simple-signer.init [moved from debian/cacert-gigi.gigi-simple-signer.init with 100% similarity]
debian/wpia-gigi.gigi-standalone.init [moved from debian/cacert-gigi.gigi-standalone.init with 100% similarity]
debian/wpia-gigi.install [moved from debian/cacert-gigi.install with 100% similarity]
debian/wpia-gigi.manpages [moved from debian/cacert-gigi.manpages with 100% similarity]
debian/wpia-gigi.postinst [moved from debian/cacert-gigi.postinst with 93% similarity]
debian/wpia-gigi.templates [moved from debian/cacert-gigi.templates with 73% similarity]
doc/beforeYouStart.txt
doc/scripts/gigi
natives/Makefile
natives/club_wpia_gigi_natives_SetUID.c [moved from natives/org_cacert_gigi_natives_SetUID.c with 87% similarity]
src/club/wpia/gigi/Gigi.java [moved from src/org/cacert/gigi/Gigi.java with 84% similarity]
src/club/wpia/gigi/Gigi.templ [moved from src/org/cacert/gigi/Gigi.templ with 100% similarity]
src/club/wpia/gigi/GigiApiException.java [moved from src/org/cacert/gigi/GigiApiException.java with 94% similarity]
src/club/wpia/gigi/GigiConfig.java [moved from src/org/cacert/gigi/GigiConfig.java with 99% similarity]
src/club/wpia/gigi/Launcher.java [moved from src/org/cacert/gigi/Launcher.java with 98% similarity]
src/club/wpia/gigi/PermissionCheckable.java [moved from src/org/cacert/gigi/PermissionCheckable.java with 57% similarity]
src/club/wpia/gigi/PolicyRedirector.java [moved from src/org/cacert/gigi/PolicyRedirector.java with 97% similarity]
src/club/wpia/gigi/api/APIPoint.java [moved from src/org/cacert/gigi/api/APIPoint.java with 91% similarity]
src/club/wpia/gigi/api/CATSImport.java [moved from src/org/cacert/gigi/api/CATSImport.java with 91% similarity]
src/club/wpia/gigi/api/CATSResolve.java [moved from src/org/cacert/gigi/api/CATSResolve.java with 85% similarity]
src/club/wpia/gigi/api/CATSRestrictedApi.java [moved from src/org/cacert/gigi/api/CATSRestrictedApi.java with 78% similarity]
src/club/wpia/gigi/api/CreateCertificate.java [moved from src/org/cacert/gigi/api/CreateCertificate.java with 83% similarity]
src/club/wpia/gigi/api/EmailReping.java [moved from src/org/cacert/gigi/api/EmailReping.java with 85% similarity]
src/club/wpia/gigi/api/Emails.java [moved from src/org/cacert/gigi/api/Emails.java with 91% similarity]
src/club/wpia/gigi/api/FindAgent.java [moved from src/org/cacert/gigi/api/FindAgent.java with 91% similarity]
src/club/wpia/gigi/api/GigiAPI.java [moved from src/org/cacert/gigi/api/GigiAPI.java with 93% similarity]
src/club/wpia/gigi/api/RevokeCertificate.java [moved from src/org/cacert/gigi/api/RevokeCertificate.java with 85% similarity]
src/club/wpia/gigi/crypto/SMIME.java [moved from src/org/cacert/gigi/crypto/SMIME.java with 98% similarity]
src/club/wpia/gigi/crypto/SPKAC.java [moved from src/org/cacert/gigi/crypto/SPKAC.java with 98% similarity]
src/club/wpia/gigi/database/DBEnum.java [moved from src/org/cacert/gigi/database/DBEnum.java with 64% similarity]
src/club/wpia/gigi/database/DatabaseConnection.java [moved from src/org/cacert/gigi/database/DatabaseConnection.java with 99% similarity]
src/club/wpia/gigi/database/GigiPreparedStatement.java [moved from src/org/cacert/gigi/database/GigiPreparedStatement.java with 99% similarity]
src/club/wpia/gigi/database/GigiResultSet.java [moved from src/org/cacert/gigi/database/GigiResultSet.java with 99% similarity]
src/club/wpia/gigi/database/SQLFileManager.java [moved from src/org/cacert/gigi/database/SQLFileManager.java with 98% similarity]
src/club/wpia/gigi/database/tableStructure.sql [moved from src/org/cacert/gigi/database/tableStructure.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_1.sql [moved from src/org/cacert/gigi/database/upgrade/from_1.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_10.sql [moved from src/org/cacert/gigi/database/upgrade/from_10.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_11.sql [moved from src/org/cacert/gigi/database/upgrade/from_11.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_12.sql [moved from src/org/cacert/gigi/database/upgrade/from_12.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_13.sql [moved from src/org/cacert/gigi/database/upgrade/from_13.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_14.sql [moved from src/org/cacert/gigi/database/upgrade/from_14.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_15.sql [moved from src/org/cacert/gigi/database/upgrade/from_15.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_16.sql [moved from src/org/cacert/gigi/database/upgrade/from_16.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_17.sql [moved from src/org/cacert/gigi/database/upgrade/from_17.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_18.sql [moved from src/org/cacert/gigi/database/upgrade/from_18.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_19.sql [moved from src/org/cacert/gigi/database/upgrade/from_19.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_2.sql [moved from src/org/cacert/gigi/database/upgrade/from_2.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_20.sql [moved from src/org/cacert/gigi/database/upgrade/from_20.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_21.sql [moved from src/org/cacert/gigi/database/upgrade/from_21.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_22.sql [moved from src/org/cacert/gigi/database/upgrade/from_22.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_23.sql [moved from src/org/cacert/gigi/database/upgrade/from_23.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_24.sql [moved from src/org/cacert/gigi/database/upgrade/from_24.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_25.sql [moved from src/org/cacert/gigi/database/upgrade/from_25.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_3.sql [moved from src/org/cacert/gigi/database/upgrade/from_3.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_4.sql [moved from src/org/cacert/gigi/database/upgrade/from_4.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_5.sql [moved from src/org/cacert/gigi/database/upgrade/from_5.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_6.sql [moved from src/org/cacert/gigi/database/upgrade/from_6.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_7.sql [moved from src/org/cacert/gigi/database/upgrade/from_7.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_8.sql [moved from src/org/cacert/gigi/database/upgrade/from_8.sql with 100% similarity]
src/club/wpia/gigi/database/upgrade/from_9.sql [moved from src/org/cacert/gigi/database/upgrade/from_9.sql with 100% similarity]
src/club/wpia/gigi/dbObjects/Assurance.java [moved from src/org/cacert/gigi/dbObjects/Assurance.java with 93% similarity]
src/club/wpia/gigi/dbObjects/CACertificate.java [moved from src/org/cacert/gigi/dbObjects/CACertificate.java with 97% similarity]
src/club/wpia/gigi/dbObjects/CATS.java [moved from src/org/cacert/gigi/dbObjects/CATS.java with 94% similarity]
src/club/wpia/gigi/dbObjects/Certificate.java [moved from src/org/cacert/gigi/dbObjects/Certificate.java with 97% similarity]
src/club/wpia/gigi/dbObjects/CertificateOwner.java [moved from src/org/cacert/gigi/dbObjects/CertificateOwner.java with 96% similarity]
src/club/wpia/gigi/dbObjects/CertificateProfile.java [moved from src/org/cacert/gigi/dbObjects/CertificateProfile.java with 98% similarity]
src/club/wpia/gigi/dbObjects/Country.java [moved from src/org/cacert/gigi/dbObjects/Country.java with 95% similarity]
src/club/wpia/gigi/dbObjects/Digest.java [moved from src/org/cacert/gigi/dbObjects/Digest.java with 76% similarity]
src/club/wpia/gigi/dbObjects/Domain.java [moved from src/org/cacert/gigi/dbObjects/Domain.java with 97% similarity]
src/club/wpia/gigi/dbObjects/DomainPingConfiguration.java [moved from src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java with 91% similarity]
src/club/wpia/gigi/dbObjects/DomainPingExecution.java [moved from src/org/cacert/gigi/dbObjects/DomainPingExecution.java with 91% similarity]
src/club/wpia/gigi/dbObjects/DomainPingType.java [moved from src/org/cacert/gigi/dbObjects/DomainPingType.java with 69% similarity]
src/club/wpia/gigi/dbObjects/EmailAddress.java [moved from src/org/cacert/gigi/dbObjects/EmailAddress.java with 94% similarity]
src/club/wpia/gigi/dbObjects/Group.java [moved from src/org/cacert/gigi/dbObjects/Group.java with 93% similarity]
src/club/wpia/gigi/dbObjects/IdCachable.java [moved from src/org/cacert/gigi/dbObjects/IdCachable.java with 62% similarity]
src/club/wpia/gigi/dbObjects/Job.java [moved from src/org/cacert/gigi/dbObjects/Job.java with 91% similarity]
src/club/wpia/gigi/dbObjects/Name.java [moved from src/org/cacert/gigi/dbObjects/Name.java with 97% similarity]
src/club/wpia/gigi/dbObjects/NamePart.java [moved from src/org/cacert/gigi/dbObjects/NamePart.java with 91% similarity]
src/club/wpia/gigi/dbObjects/ObjectCache.java [moved from src/org/cacert/gigi/dbObjects/ObjectCache.java with 96% similarity]
src/club/wpia/gigi/dbObjects/Organisation.java [moved from src/org/cacert/gigi/dbObjects/Organisation.java with 96% similarity]
src/club/wpia/gigi/dbObjects/SupportNotificationMail.templ [moved from src/org/cacert/gigi/dbObjects/SupportNotificationMail.templ with 100% similarity]
src/club/wpia/gigi/dbObjects/SupportUserNotificationMail.templ [moved from src/org/cacert/gigi/dbObjects/SupportUserNotificationMail.templ with 100% similarity]
src/club/wpia/gigi/dbObjects/SupportedUser.java [moved from src/org/cacert/gigi/dbObjects/SupportedUser.java with 93% similarity]
src/club/wpia/gigi/dbObjects/User.java [moved from src/org/cacert/gigi/dbObjects/User.java with 96% similarity]
src/club/wpia/gigi/dbObjects/Verifyable.java [moved from src/org/cacert/gigi/dbObjects/Verifyable.java with 68% similarity]
src/club/wpia/gigi/dbObjects/wrappers/DataContainer.java [moved from src/org/cacert/gigi/dbObjects/wrappers/DataContainer.java with 76% similarity]
src/club/wpia/gigi/email/EmailProvider.java [moved from src/org/cacert/gigi/email/EmailProvider.java with 96% similarity]
src/club/wpia/gigi/email/MailProbe.java [moved from src/org/cacert/gigi/email/MailProbe.java with 76% similarity]
src/club/wpia/gigi/email/MailProbe.templ [moved from src/org/cacert/gigi/email/MailProbe.templ with 100% similarity]
src/club/wpia/gigi/email/SendMail.java [moved from src/org/cacert/gigi/email/SendMail.java with 96% similarity]
src/club/wpia/gigi/localisation/Language.java [moved from src/org/cacert/gigi/localisation/Language.java with 99% similarity]
src/club/wpia/gigi/natives/SetUID.java [moved from src/org/cacert/gigi/natives/SetUID.java with 95% similarity]
src/club/wpia/gigi/output/ArrayIterable.java [moved from src/org/cacert/gigi/output/ArrayIterable.java with 78% similarity]
src/club/wpia/gigi/output/AssurancesDisplay.java [moved from src/org/cacert/gigi/output/AssurancesDisplay.java with 90% similarity]
src/club/wpia/gigi/output/AssurancesDisplay.templ [moved from src/org/cacert/gigi/output/AssurancesDisplay.templ with 100% similarity]
src/club/wpia/gigi/output/CertificateIterable.java [moved from src/org/cacert/gigi/output/CertificateIterable.java with 89% similarity]
src/club/wpia/gigi/output/CertificateTable.templ [moved from src/org/cacert/gigi/output/CertificateTable.templ with 100% similarity]
src/club/wpia/gigi/output/CertificateValiditySelector.java [moved from src/org/cacert/gigi/output/CertificateValiditySelector.java with 95% similarity]
src/club/wpia/gigi/output/ClientCSRGenerate.java [moved from src/org/cacert/gigi/output/ClientCSRGenerate.java with 85% similarity]
src/club/wpia/gigi/output/ClientCSRGenerate.templ [moved from src/org/cacert/gigi/output/ClientCSRGenerate.templ with 100% similarity]
src/club/wpia/gigi/output/CountrySelector.java [moved from src/org/cacert/gigi/output/CountrySelector.java with 85% similarity]
src/club/wpia/gigi/output/CountrySelector.templ [moved from src/org/cacert/gigi/output/CountrySelector.templ with 100% similarity]
src/club/wpia/gigi/output/DateSelector.java [moved from src/org/cacert/gigi/output/DateSelector.java with 93% similarity]
src/club/wpia/gigi/output/GroupIterator.java [moved from src/org/cacert/gigi/output/GroupIterator.java with 81% similarity]
src/club/wpia/gigi/output/GroupSelector.java [moved from src/org/cacert/gigi/output/GroupSelector.java with 86% similarity]
src/club/wpia/gigi/output/HashAlgorithms.java [moved from src/org/cacert/gigi/output/HashAlgorithms.java with 79% similarity]
src/club/wpia/gigi/output/IMenuItem.java [moved from src/org/cacert/gigi/output/IMenuItem.java with 58% similarity]
src/club/wpia/gigi/output/IterableIterable.java [moved from src/org/cacert/gigi/output/IterableIterable.java with 80% similarity]
src/club/wpia/gigi/output/Menu.java [moved from src/org/cacert/gigi/output/Menu.java with 93% similarity]
src/club/wpia/gigi/output/MenuCollector.java [moved from src/org/cacert/gigi/output/MenuCollector.java with 81% similarity]
src/club/wpia/gigi/output/NameInput.java [moved from src/org/cacert/gigi/output/NameInput.java with 89% similarity]
src/club/wpia/gigi/output/NameInput.templ [moved from src/org/cacert/gigi/output/NameInput.templ with 100% similarity]
src/club/wpia/gigi/output/PageMenuItem.java [moved from src/org/cacert/gigi/output/PageMenuItem.java with 75% similarity]
src/club/wpia/gigi/output/SimpleMenuItem.java [moved from src/org/cacert/gigi/output/SimpleMenuItem.java with 80% similarity]
src/club/wpia/gigi/output/SimpleUntranslatedMenuItem.java [moved from src/org/cacert/gigi/output/SimpleUntranslatedMenuItem.java with 85% similarity]
src/club/wpia/gigi/output/TrustchainIterable.java [moved from src/org/cacert/gigi/output/TrustchainIterable.java with 76% similarity]
src/club/wpia/gigi/output/template/ForeachStatement.java [moved from src/org/cacert/gigi/output/template/ForeachStatement.java with 93% similarity]
src/club/wpia/gigi/output/template/Form.java [moved from src/org/cacert/gigi/output/template/Form.java with 97% similarity]
src/club/wpia/gigi/output/template/IfStatement.java [moved from src/org/cacert/gigi/output/template/IfStatement.java with 95% similarity]
src/club/wpia/gigi/output/template/IterableDataset.java [moved from src/org/cacert/gigi/output/template/IterableDataset.java with 87% similarity]
src/club/wpia/gigi/output/template/MailFooter.templ [moved from src/org/cacert/gigi/output/template/MailFooter.templ with 100% similarity]
src/club/wpia/gigi/output/template/MailTemplate.java [moved from src/org/cacert/gigi/output/template/MailTemplate.java with 95% similarity]
src/club/wpia/gigi/output/template/OutputVariableCommand.java [moved from src/org/cacert/gigi/output/template/OutputVariableCommand.java with 91% similarity]
src/club/wpia/gigi/output/template/Outputable.java [moved from src/org/cacert/gigi/output/template/Outputable.java with 88% similarity]
src/club/wpia/gigi/output/template/OutputableArrayIterable.java [moved from src/org/cacert/gigi/output/template/OutputableArrayIterable.java with 91% similarity]
src/club/wpia/gigi/output/template/PlainOutputable.java [moved from src/org/cacert/gigi/output/template/PlainOutputable.java with 78% similarity]
src/club/wpia/gigi/output/template/Scope.java [moved from src/org/cacert/gigi/output/template/Scope.java with 90% similarity]
src/club/wpia/gigi/output/template/SprintfCommand.java [moved from src/org/cacert/gigi/output/template/SprintfCommand.java with 97% similarity]
src/club/wpia/gigi/output/template/Template.java [moved from src/org/cacert/gigi/output/template/Template.java with 98% similarity]
src/club/wpia/gigi/output/template/TemplateBlock.java [moved from src/org/cacert/gigi/output/template/TemplateBlock.java with 89% similarity]
src/club/wpia/gigi/output/template/TemplateParseException.java [moved from src/org/cacert/gigi/output/template/TemplateParseException.java with 98% similarity]
src/club/wpia/gigi/output/template/Translatable.java [moved from src/org/cacert/gigi/output/template/Translatable.java with 91% similarity]
src/club/wpia/gigi/output/template/TranslateCommand.java [moved from src/org/cacert/gigi/output/template/TranslateCommand.java with 90% similarity]
src/club/wpia/gigi/pages/AboutPage.java [moved from src/org/cacert/gigi/pages/AboutPage.java with 81% similarity]
src/club/wpia/gigi/pages/AboutPage.templ [moved from src/org/cacert/gigi/pages/AboutPage.templ with 100% similarity]
src/club/wpia/gigi/pages/HandlesMixedRequest.java [moved from src/org/cacert/gigi/pages/HandlesMixedRequest.java with 89% similarity]
src/club/wpia/gigi/pages/LoginPage.java [moved from src/org/cacert/gigi/pages/LoginPage.java with 89% similarity]
src/club/wpia/gigi/pages/LoginPage.templ [moved from src/org/cacert/gigi/pages/LoginPage.templ with 100% similarity]
src/club/wpia/gigi/pages/LogoutPage.java [moved from src/org/cacert/gigi/pages/LogoutPage.java with 88% similarity]
src/club/wpia/gigi/pages/MainPage.java [moved from src/org/cacert/gigi/pages/MainPage.java with 91% similarity]
src/club/wpia/gigi/pages/MainPage.templ [moved from src/org/cacert/gigi/pages/MainPage.templ with 100% similarity]
src/club/wpia/gigi/pages/MainPageNotLogin.templ [moved from src/org/cacert/gigi/pages/MainPageNotLogin.templ with 100% similarity]
src/club/wpia/gigi/pages/ManagedFormPage.java [moved from src/org/cacert/gigi/pages/ManagedFormPage.java with 91% similarity]
src/club/wpia/gigi/pages/ManagedMultiFormPage.java [moved from src/org/cacert/gigi/pages/ManagedMultiFormPage.java with 86% similarity]
src/club/wpia/gigi/pages/OneFormPage.java [moved from src/org/cacert/gigi/pages/OneFormPage.java with 91% similarity]
src/club/wpia/gigi/pages/Page.java [moved from src/org/cacert/gigi/pages/Page.java with 95% similarity]
src/club/wpia/gigi/pages/PasswordResetForm.templ [moved from src/org/cacert/gigi/pages/PasswordResetForm.templ with 100% similarity]
src/club/wpia/gigi/pages/PasswordResetMail.templ [moved from src/org/cacert/gigi/pages/PasswordResetMail.templ with 100% similarity]
src/club/wpia/gigi/pages/PasswordResetPage.java [moved from src/org/cacert/gigi/pages/PasswordResetPage.java with 89% similarity]
src/club/wpia/gigi/pages/PolicyIndex.java [moved from src/org/cacert/gigi/pages/PolicyIndex.java with 97% similarity]
src/club/wpia/gigi/pages/RootCertPage.java [moved from src/org/cacert/gigi/pages/RootCertPage.java with 96% similarity]
src/club/wpia/gigi/pages/RootCertPage.templ [moved from src/org/cacert/gigi/pages/RootCertPage.templ with 100% similarity]
src/club/wpia/gigi/pages/StaticPage.java [moved from src/org/cacert/gigi/pages/StaticPage.java with 90% similarity]
src/club/wpia/gigi/pages/TestSecure.java [moved from src/org/cacert/gigi/pages/TestSecure.java with 95% similarity]
src/club/wpia/gigi/pages/Verify.java [moved from src/org/cacert/gigi/pages/Verify.java with 91% similarity]
src/club/wpia/gigi/pages/Verify.templ [moved from src/org/cacert/gigi/pages/Verify.templ with 100% similarity]
src/club/wpia/gigi/pages/account/ChangeForm.java [moved from src/org/cacert/gigi/pages/account/ChangeForm.java with 81% similarity]
src/club/wpia/gigi/pages/account/ChangePasswordForm.templ [moved from src/org/cacert/gigi/pages/account/ChangePasswordForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/ChangePasswordPage.java [moved from src/org/cacert/gigi/pages/account/ChangePasswordPage.java with 80% similarity]
src/club/wpia/gigi/pages/account/FindAgentAccess.java [moved from src/org/cacert/gigi/pages/account/FindAgentAccess.java with 79% similarity]
src/club/wpia/gigi/pages/account/FindAgentAccess.templ [moved from src/org/cacert/gigi/pages/account/FindAgentAccess.templ with 100% similarity]
src/club/wpia/gigi/pages/account/History.java [moved from src/org/cacert/gigi/pages/account/History.java with 87% similarity]
src/club/wpia/gigi/pages/account/History.templ [moved from src/org/cacert/gigi/pages/account/History.templ with 100% similarity]
src/club/wpia/gigi/pages/account/MyDetails.java [moved from src/org/cacert/gigi/pages/account/MyDetails.java with 93% similarity]
src/club/wpia/gigi/pages/account/MyDetails.templ [moved from src/org/cacert/gigi/pages/account/MyDetails.templ with 100% similarity]
src/club/wpia/gigi/pages/account/MyDetailsForm.java [moved from src/org/cacert/gigi/pages/account/MyDetailsForm.java with 90% similarity]
src/club/wpia/gigi/pages/account/MyDetailsForm.templ [moved from src/org/cacert/gigi/pages/account/MyDetailsForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/MyDetailsFormAssured.templ [moved from src/org/cacert/gigi/pages/account/MyDetailsFormAssured.templ with 100% similarity]
src/club/wpia/gigi/pages/account/MyDetailsRoles.templ [moved from src/org/cacert/gigi/pages/account/MyDetailsRoles.templ with 100% similarity]
src/club/wpia/gigi/pages/account/MyOrganisationsForm.java [moved from src/org/cacert/gigi/pages/account/MyOrganisationsForm.java with 85% similarity]
src/club/wpia/gigi/pages/account/MyOrganisationsForm.templ [moved from src/org/cacert/gigi/pages/account/MyOrganisationsForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/NamesForm.templ [moved from src/org/cacert/gigi/pages/account/NamesForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/UserTrainings.java [moved from src/org/cacert/gigi/pages/account/UserTrainings.java with 87% similarity]
src/club/wpia/gigi/pages/account/UserTrainings.templ [moved from src/org/cacert/gigi/pages/account/UserTrainings.templ with 100% similarity]
src/club/wpia/gigi/pages/account/certs/CertificateAdd.java [moved from src/org/cacert/gigi/pages/account/certs/CertificateAdd.java with 80% similarity]
src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ [moved from src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ with 100% similarity]
src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.java [moved from src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java with 87% similarity]
src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.templ [moved from src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/certs/CertificateModificationForm.java [moved from src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java with 84% similarity]
src/club/wpia/gigi/pages/account/certs/CertificateModificationForm.templ [moved from src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/certs/CertificateRequest.java [moved from src/org/cacert/gigi/pages/account/certs/CertificateRequest.java with 96% similarity]
src/club/wpia/gigi/pages/account/certs/Certificates.java [moved from src/org/cacert/gigi/pages/account/certs/Certificates.java with 91% similarity]
src/club/wpia/gigi/pages/account/certs/RequestCertificate.templ [moved from src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ with 100% similarity]
src/club/wpia/gigi/pages/account/certs/RevokeSingleCertForm.java [moved from src/org/cacert/gigi/pages/account/certs/RevokeSingleCertForm.java with 74% similarity]
src/club/wpia/gigi/pages/account/certs/RevokeSingleCertForm.templ [moved from src/org/cacert/gigi/pages/account/certs/RevokeSingleCertForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/domain/DomainAddForm.java [moved from src/org/cacert/gigi/pages/account/domain/DomainAddForm.java with 80% similarity]
src/club/wpia/gigi/pages/account/domain/DomainAddForm.templ [moved from src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/domain/DomainManagementForm.java [moved from src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java with 83% similarity]
src/club/wpia/gigi/pages/account/domain/DomainManagementForm.templ [moved from src/org/cacert/gigi/pages/account/domain/DomainManagementForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/domain/DomainOverview.java [moved from src/org/cacert/gigi/pages/account/domain/DomainOverview.java with 79% similarity]
src/club/wpia/gigi/pages/account/domain/DomainOverview.templ [moved from src/org/cacert/gigi/pages/account/domain/DomainOverview.templ with 100% similarity]
src/club/wpia/gigi/pages/account/domain/DomainPinglogForm.java [moved from src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java with 83% similarity]
src/club/wpia/gigi/pages/account/domain/DomainPinglogForm.templ [moved from src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/domain/EditDomain.java [moved from src/org/cacert/gigi/pages/account/domain/EditDomain.java with 83% similarity]
src/club/wpia/gigi/pages/account/domain/PingConfigForm.java [moved from src/org/cacert/gigi/pages/account/domain/PingConfigForm.java with 92% similarity]
src/club/wpia/gigi/pages/account/domain/PingConfigForm.templ [moved from src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/mail/MailAddForm.java [moved from src/org/cacert/gigi/pages/account/mail/MailAddForm.java with 72% similarity]
src/club/wpia/gigi/pages/account/mail/MailAddForm.templ [moved from src/org/cacert/gigi/pages/account/mail/MailAddForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/mail/MailManagementForm.java [moved from src/org/cacert/gigi/pages/account/mail/MailManagementForm.java with 87% similarity]
src/club/wpia/gigi/pages/account/mail/MailManagementForm.templ [moved from src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ with 100% similarity]
src/club/wpia/gigi/pages/account/mail/MailOverview.java [moved from src/org/cacert/gigi/pages/account/mail/MailOverview.java with 84% similarity]
src/club/wpia/gigi/pages/account/mail/MailOverview.templ [moved from src/org/cacert/gigi/pages/account/mail/MailOverview.templ with 100% similarity]
src/club/wpia/gigi/pages/admin/TTPAdminForm.java [moved from src/org/cacert/gigi/pages/admin/TTPAdminForm.java with 77% similarity]
src/club/wpia/gigi/pages/admin/TTPAdminForm.templ [moved from src/org/cacert/gigi/pages/admin/TTPAdminForm.templ with 100% similarity]
src/club/wpia/gigi/pages/admin/TTPAdminPage.java [moved from src/org/cacert/gigi/pages/admin/TTPAdminPage.java with 87% similarity]
src/club/wpia/gigi/pages/admin/TTPAdminPage.templ [moved from src/org/cacert/gigi/pages/admin/TTPAdminPage.templ with 100% similarity]
src/club/wpia/gigi/pages/admin/support/FindCertForm.java [moved from src/org/cacert/gigi/pages/admin/support/FindCertForm.java with 86% similarity]
src/club/wpia/gigi/pages/admin/support/FindCertForm.templ [moved from src/org/cacert/gigi/pages/admin/support/FindCertForm.templ with 100% similarity]
src/club/wpia/gigi/pages/admin/support/FindCertPage.java [moved from src/org/cacert/gigi/pages/admin/support/FindCertPage.java with 83% similarity]
src/club/wpia/gigi/pages/admin/support/FindCertPage.templ [moved from src/org/cacert/gigi/pages/admin/support/FindCertPage.templ with 100% similarity]
src/club/wpia/gigi/pages/admin/support/FindUserByDomainForm.java [moved from src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.java with 82% similarity]
src/club/wpia/gigi/pages/admin/support/FindUserByDomainForm.templ [moved from src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ with 100% similarity]
src/club/wpia/gigi/pages/admin/support/FindUserByDomainPage.java [moved from src/org/cacert/gigi/pages/admin/support/FindUserByDomainPage.java with 80% similarity]
src/club/wpia/gigi/pages/admin/support/FindUserByEmailForm.java [moved from src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.java with 79% similarity]
src/club/wpia/gigi/pages/admin/support/FindUserByEmailForm.templ [moved from src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ with 100% similarity]
src/club/wpia/gigi/pages/admin/support/FindUserByEmailPage.java [moved from src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java with 86% similarity]
src/club/wpia/gigi/pages/admin/support/FindUserByEmailUsertable.templ [moved from src/org/cacert/gigi/pages/admin/support/FindUserByEmailUsertable.templ with 100% similarity]
src/club/wpia/gigi/pages/admin/support/SupportEnterTicketForm.java [moved from src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java with 82% similarity]
src/club/wpia/gigi/pages/admin/support/SupportEnterTicketForm.templ [moved from src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ with 100% similarity]
src/club/wpia/gigi/pages/admin/support/SupportEnterTicketPage.java [moved from src/org/cacert/gigi/pages/admin/support/SupportEnterTicketPage.java with 86% similarity]
src/club/wpia/gigi/pages/admin/support/SupportRevokeCertificatesForm.java [moved from src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java with 86% similarity]
src/club/wpia/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ [moved from src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ with 100% similarity]
src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.java [moved from src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java with 84% similarity]
src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.templ [moved from src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ with 100% similarity]
src/club/wpia/gigi/pages/admin/support/SupportUserDetailsPage.java [moved from src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java with 89% similarity]
src/club/wpia/gigi/pages/admin/support/SupportUserDetailsPage.templ [moved from src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ with 100% similarity]
src/club/wpia/gigi/pages/error/AccessDenied.java [moved from src/org/cacert/gigi/pages/error/AccessDenied.java with 88% similarity]
src/club/wpia/gigi/pages/error/AccessDenied.templ [moved from src/org/cacert/gigi/pages/error/AccessDenied.templ with 100% similarity]
src/club/wpia/gigi/pages/error/PageNotFound.java [moved from src/org/cacert/gigi/pages/error/PageNotFound.java with 93% similarity]
src/club/wpia/gigi/pages/error/PageNotFound.templ [moved from src/org/cacert/gigi/pages/error/PageNotFound.templ with 100% similarity]
src/club/wpia/gigi/pages/main/RegisterPage.java [moved from src/org/cacert/gigi/pages/main/RegisterPage.java with 88% similarity]
src/club/wpia/gigi/pages/main/RegisterPage.templ [moved from src/org/cacert/gigi/pages/main/RegisterPage.templ with 100% similarity]
src/club/wpia/gigi/pages/main/Signup.java [moved from src/org/cacert/gigi/pages/main/Signup.java with 87% similarity]
src/club/wpia/gigi/pages/main/Signup.templ [moved from src/org/cacert/gigi/pages/main/Signup.templ with 100% similarity]
src/club/wpia/gigi/pages/orga/AffiliationForm.java [moved from src/org/cacert/gigi/pages/orga/AffiliationForm.java with 83% similarity]
src/club/wpia/gigi/pages/orga/AffiliationForm.templ [moved from src/org/cacert/gigi/pages/orga/AffiliationForm.templ with 100% similarity]
src/club/wpia/gigi/pages/orga/CreateOrgForm.java [moved from src/org/cacert/gigi/pages/orga/CreateOrgForm.java with 90% similarity]
src/club/wpia/gigi/pages/orga/CreateOrgForm.templ [moved from src/org/cacert/gigi/pages/orga/CreateOrgForm.templ with 100% similarity]
src/club/wpia/gigi/pages/orga/CreateOrgPage.java [moved from src/org/cacert/gigi/pages/orga/CreateOrgPage.java with 81% similarity]
src/club/wpia/gigi/pages/orga/EditOrg.templ [moved from src/org/cacert/gigi/pages/orga/EditOrg.templ with 100% similarity]
src/club/wpia/gigi/pages/orga/OrgDomainAddForm.java [moved from src/org/cacert/gigi/pages/orga/OrgDomainAddForm.java with 71% similarity]
src/club/wpia/gigi/pages/orga/OrgDomainAddForm.templ [moved from src/org/cacert/gigi/pages/orga/OrgDomainAddForm.templ with 100% similarity]
src/club/wpia/gigi/pages/orga/ViewOrgPage.java [moved from src/org/cacert/gigi/pages/orga/ViewOrgPage.java with 87% similarity]
src/club/wpia/gigi/pages/orga/ViewOrgs.templ [moved from src/org/cacert/gigi/pages/orga/ViewOrgs.templ with 100% similarity]
src/club/wpia/gigi/pages/statistics/StatisticsRoles.java [moved from src/org/cacert/gigi/pages/statistics/StatisticsRoles.java with 85% similarity]
src/club/wpia/gigi/pages/statistics/StatisticsRoles.templ [moved from src/org/cacert/gigi/pages/statistics/StatisticsRoles.templ with 100% similarity]
src/club/wpia/gigi/pages/wot/AssuranceForm.java [moved from src/org/cacert/gigi/pages/wot/AssuranceForm.java with 90% similarity]
src/club/wpia/gigi/pages/wot/AssuranceForm.templ [moved from src/org/cacert/gigi/pages/wot/AssuranceForm.templ with 100% similarity]
src/club/wpia/gigi/pages/wot/AssurePage.java [moved from src/org/cacert/gigi/pages/wot/AssurePage.java with 87% similarity]
src/club/wpia/gigi/pages/wot/AssureeSearch.templ [moved from src/org/cacert/gigi/pages/wot/AssureeSearch.templ with 100% similarity]
src/club/wpia/gigi/pages/wot/Points.java [moved from src/org/cacert/gigi/pages/wot/Points.java with 91% similarity]
src/club/wpia/gigi/pages/wot/Points.templ [moved from src/org/cacert/gigi/pages/wot/Points.templ with 100% similarity]
src/club/wpia/gigi/pages/wot/RequestTTPForm.java [moved from src/org/cacert/gigi/pages/wot/RequestTTPForm.java with 77% similarity]
src/club/wpia/gigi/pages/wot/RequestTTPForm.templ [moved from src/org/cacert/gigi/pages/wot/RequestTTPForm.templ with 100% similarity]
src/club/wpia/gigi/pages/wot/RequestTTPPage.java [moved from src/org/cacert/gigi/pages/wot/RequestTTPPage.java with 87% similarity]
src/club/wpia/gigi/pages/wot/RequestTTPPage.templ [moved from src/org/cacert/gigi/pages/wot/RequestTTPPage.templ with 100% similarity]
src/club/wpia/gigi/pages/wot/Rules.templ [moved from src/org/cacert/gigi/pages/wot/Rules.templ with 100% similarity]
src/club/wpia/gigi/ping/DNSPinger.java [moved from src/org/cacert/gigi/ping/DNSPinger.java with 89% similarity]
src/club/wpia/gigi/ping/DomainPinger.java [moved from src/org/cacert/gigi/ping/DomainPinger.java with 89% similarity]
src/club/wpia/gigi/ping/EmailPinger.java [moved from src/org/cacert/gigi/ping/EmailPinger.java with 75% similarity]
src/club/wpia/gigi/ping/HTTPFetch.java [moved from src/org/cacert/gigi/ping/HTTPFetch.java with 90% similarity]
src/club/wpia/gigi/ping/PingerDaemon.java [moved from src/org/cacert/gigi/ping/PingerDaemon.java with 90% similarity]
src/club/wpia/gigi/ping/SSLPinger.java [moved from src/org/cacert/gigi/ping/SSLPinger.java with 98% similarity]
src/club/wpia/gigi/util/AuthorizationContext.java [moved from src/org/cacert/gigi/util/AuthorizationContext.java with 87% similarity]
src/club/wpia/gigi/util/CAA.java [moved from src/org/cacert/gigi/util/CAA.java with 94% similarity]
src/club/wpia/gigi/util/CalendarUtil.java [moved from src/org/cacert/gigi/util/CalendarUtil.java with 97% similarity]
src/club/wpia/gigi/util/CertExporter.java [moved from src/org/cacert/gigi/util/CertExporter.java with 98% similarity]
src/club/wpia/gigi/util/CipherInfo.java [moved from src/org/cacert/gigi/util/CipherInfo.java with 99% similarity]
src/club/wpia/gigi/util/DNSUtil.java [moved from src/org/cacert/gigi/util/DNSUtil.java with 97% similarity]
src/club/wpia/gigi/util/DayDate.java [moved from src/org/cacert/gigi/util/DayDate.java with 98% similarity]
src/club/wpia/gigi/util/DomainAssessment.java [moved from src/org/cacert/gigi/util/DomainAssessment.java with 98% similarity]
src/club/wpia/gigi/util/EditDistance.java [moved from src/org/cacert/gigi/util/EditDistance.java with 98% similarity]
src/club/wpia/gigi/util/HTMLEncoder.java [moved from src/org/cacert/gigi/util/HTMLEncoder.java with 90% similarity]
src/club/wpia/gigi/util/KeyStorage.java [moved from src/org/cacert/gigi/util/KeyStorage.java with 96% similarity]
src/club/wpia/gigi/util/Notary.java [moved from src/org/cacert/gigi/util/Notary.java with 95% similarity]
src/club/wpia/gigi/util/PEM.java [moved from src/org/cacert/gigi/util/PEM.java with 96% similarity]
src/club/wpia/gigi/util/PasswordHash.java [moved from src/org/cacert/gigi/util/PasswordHash.java with 99% similarity]
src/club/wpia/gigi/util/PasswordStrengthChecker.java [moved from src/org/cacert/gigi/util/PasswordStrengthChecker.java with 94% similarity]
src/club/wpia/gigi/util/PublicSuffixes.java [moved from src/org/cacert/gigi/util/PublicSuffixes.java with 99% similarity]
src/club/wpia/gigi/util/RandomToken.java [moved from src/org/cacert/gigi/util/RandomToken.java with 95% similarity]
src/club/wpia/gigi/util/RateLimit.java [moved from src/org/cacert/gigi/util/RateLimit.java with 96% similarity]
src/club/wpia/gigi/util/ServerConstants.java [moved from src/org/cacert/gigi/util/ServerConstants.java with 91% similarity]
src/club/wpia/gigi/util/SystemKeywords.java [moved from src/org/cacert/gigi/util/SystemKeywords.java with 92% similarity]
src/club/wpia/gigi/util/TimeConditions.java [moved from src/org/cacert/gigi/util/TimeConditions.java with 97% similarity]
src/club/wpia/gigi/util/VerificationAgentEntered.templ [moved from src/org/cacert/gigi/util/VerificationAgentEntered.templ with 100% similarity]
src/club/wpia/gigi/util/VerificationEntered.templ [moved from src/org/cacert/gigi/util/VerificationEntered.templ with 100% similarity]
src/club/wpia/gigi/util/idn_enabled.dat [moved from src/org/cacert/gigi/util/idn_enabled.dat with 100% similarity]
tests/club/wpia/gigi/DomainVerification.java [moved from tests/org/cacert/gigi/DomainVerification.java with 87% similarity]
tests/club/wpia/gigi/LoginTest.java [moved from tests/org/cacert/gigi/LoginTest.java with 93% similarity]
tests/club/wpia/gigi/TestCalendarUtil.java [moved from tests/org/cacert/gigi/TestCalendarUtil.java with 95% similarity]
tests/club/wpia/gigi/TestCertificate.java [moved from tests/org/cacert/gigi/TestCertificate.java with 91% similarity]
tests/club/wpia/gigi/TestCrossDomainAccess.java [moved from tests/org/cacert/gigi/TestCrossDomainAccess.java with 91% similarity]
tests/club/wpia/gigi/TestDomain.java [moved from tests/org/cacert/gigi/TestDomain.java with 95% similarity]
tests/club/wpia/gigi/TestLanguage.java [moved from tests/org/cacert/gigi/TestLanguage.java with 93% similarity]
tests/club/wpia/gigi/TestName.java [moved from tests/org/cacert/gigi/TestName.java with 96% similarity]
tests/club/wpia/gigi/TestObjectCache.java [moved from tests/org/cacert/gigi/TestObjectCache.java with 87% similarity]
tests/club/wpia/gigi/TestOrga.java [moved from tests/org/cacert/gigi/TestOrga.java with 86% similarity]
tests/club/wpia/gigi/TestPasswordReset.java [moved from tests/org/cacert/gigi/TestPasswordReset.java with 93% similarity]
tests/club/wpia/gigi/TestSQL.java [moved from tests/org/cacert/gigi/TestSQL.java with 84% similarity]
tests/club/wpia/gigi/TestSSL.java [moved from tests/org/cacert/gigi/TestSSL.java with 96% similarity]
tests/club/wpia/gigi/TestSecurityHeaders.java [moved from tests/org/cacert/gigi/TestSecurityHeaders.java with 90% similarity]
tests/club/wpia/gigi/TestSeparateSessionScope.java [moved from tests/org/cacert/gigi/TestSeparateSessionScope.java with 91% similarity]
tests/club/wpia/gigi/TestUser.java [moved from tests/org/cacert/gigi/TestUser.java with 90% similarity]
tests/club/wpia/gigi/TestUserGroupMembership.java [moved from tests/org/cacert/gigi/TestUserGroupMembership.java with 93% similarity]
tests/club/wpia/gigi/TestUserSerialize.java [moved from tests/org/cacert/gigi/TestUserSerialize.java with 92% similarity]
tests/club/wpia/gigi/api/ImportCATSResult.java [moved from tests/org/cacert/gigi/api/ImportCATSResult.java with 87% similarity]
tests/club/wpia/gigi/api/IssueCert.java [moved from tests/org/cacert/gigi/api/IssueCert.java with 88% similarity]
tests/club/wpia/gigi/api/TestFindAgent.java [moved from tests/org/cacert/gigi/api/TestFindAgent.java with 86% similarity]
tests/club/wpia/gigi/crypto/TestSPKAC.java [moved from tests/org/cacert/gigi/crypto/TestSPKAC.java with 96% similarity]
tests/club/wpia/gigi/crypto/sampleSPKAC.txt [moved from tests/org/cacert/gigi/crypto/sampleSPKAC.txt with 100% similarity]
tests/club/wpia/gigi/dbObjects/TestAssurance.java [moved from tests/org/cacert/gigi/dbObjects/TestAssurance.java with 96% similarity]
tests/club/wpia/gigi/dbObjects/TestAssuranceMail.java [moved from tests/org/cacert/gigi/dbObjects/TestAssuranceMail.java with 96% similarity]
tests/club/wpia/gigi/dbObjects/TestAssureName.java [moved from tests/org/cacert/gigi/dbObjects/TestAssureName.java with 76% similarity]
tests/club/wpia/gigi/dbObjects/TestCATS.java [moved from tests/org/cacert/gigi/dbObjects/TestCATS.java with 90% similarity]
tests/club/wpia/gigi/dbObjects/TestCertificate.java [moved from tests/org/cacert/gigi/dbObjects/TestCertificate.java with 78% similarity]
tests/club/wpia/gigi/dbObjects/TestCountryCode.java [moved from tests/org/cacert/gigi/dbObjects/TestCountryCode.java with 92% similarity]
tests/club/wpia/gigi/email/TestEmailProviderClass.java [moved from tests/org/cacert/gigi/email/TestEmailProviderClass.java with 93% similarity]
tests/club/wpia/gigi/email/TestSendmail.java [moved from tests/org/cacert/gigi/email/TestSendmail.java with 93% similarity]
tests/club/wpia/gigi/pages/TestVerify.java [moved from tests/org/cacert/gigi/pages/TestVerify.java with 90% similarity]
tests/club/wpia/gigi/pages/account/TestCertificateAdd.java [moved from tests/org/cacert/gigi/pages/account/TestCertificateAdd.java with 97% similarity]
tests/club/wpia/gigi/pages/account/TestCertificateRequest.java [moved from tests/org/cacert/gigi/pages/account/TestCertificateRequest.java with 90% similarity]
tests/club/wpia/gigi/pages/account/TestChangePassword.java [moved from tests/org/cacert/gigi/pages/account/TestChangePassword.java with 95% similarity]
tests/club/wpia/gigi/pages/account/TestDomain.java [moved from tests/org/cacert/gigi/pages/account/TestDomain.java with 89% similarity]
tests/club/wpia/gigi/pages/account/TestMailManagement.java [moved from tests/org/cacert/gigi/pages/account/TestMailManagement.java with 95% similarity]
tests/club/wpia/gigi/pages/account/TestMyDetailsEdit.java [moved from tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java with 93% similarity]
tests/club/wpia/gigi/pages/account/TestPasswordResetExternal.java [moved from tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java with 88% similarity]
tests/club/wpia/gigi/pages/account/TestTrainings.java [moved from tests/org/cacert/gigi/pages/account/TestTrainings.java with 77% similarity]
tests/club/wpia/gigi/pages/admin/TestSEAdminNotificationMail.java [moved from tests/org/cacert/gigi/pages/admin/TestSEAdminNotificationMail.java with 93% similarity]
tests/club/wpia/gigi/pages/admin/TestSEAdminPageDetails.java [moved from tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java with 91% similarity]
tests/club/wpia/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java [moved from tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java with 84% similarity]
tests/club/wpia/gigi/pages/admin/TestSEAdminPageUserMailSearch.java [moved from tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserMailSearch.java with 94% similarity]
tests/club/wpia/gigi/pages/admin/TestSEAdminTicketSetting.java [moved from tests/org/cacert/gigi/pages/admin/TestSEAdminTicketSetting.java with 75% similarity]
tests/club/wpia/gigi/pages/main/RegisterPageTest.java [moved from tests/org/cacert/gigi/pages/main/RegisterPageTest.java with 95% similarity]
tests/club/wpia/gigi/pages/orga/TestOrgDomain.java [moved from tests/org/cacert/gigi/pages/orga/TestOrgDomain.java with 92% similarity]
tests/club/wpia/gigi/pages/orga/TestOrgManagement.java [moved from tests/org/cacert/gigi/pages/orga/TestOrgManagement.java with 95% similarity]
tests/club/wpia/gigi/pages/wot/TestAssurance.java [moved from tests/org/cacert/gigi/pages/wot/TestAssurance.java with 95% similarity]
tests/club/wpia/gigi/pages/wot/TestTTP.java [moved from tests/org/cacert/gigi/pages/wot/TestTTP.java with 77% similarity]
tests/club/wpia/gigi/pages/wot/TestTTPAdmin.java [moved from tests/org/cacert/gigi/pages/wot/TestTTPAdmin.java with 85% similarity]
tests/club/wpia/gigi/ping/TestDNS.java [moved from tests/org/cacert/gigi/ping/TestDNS.java with 91% similarity]
tests/club/wpia/gigi/ping/TestHTTP.java [moved from tests/org/cacert/gigi/ping/TestHTTP.java with 93% similarity]
tests/club/wpia/gigi/ping/TestSSL.java [moved from tests/org/cacert/gigi/ping/TestSSL.java with 94% similarity]
tests/club/wpia/gigi/template/TestTemplate.java [moved from tests/org/cacert/gigi/template/TestTemplate.java with 93% similarity]
tests/club/wpia/gigi/template/TestTemplateMail.java [moved from tests/org/cacert/gigi/template/TestTemplateMail.java with 87% similarity]
tests/club/wpia/gigi/template/TestTemplateUnescaped.java [moved from tests/org/cacert/gigi/template/TestTemplateUnescaped.java with 88% similarity]
tests/club/wpia/gigi/testUtils/BusinessTest.java [moved from tests/org/cacert/gigi/testUtils/BusinessTest.java with 90% similarity]
tests/club/wpia/gigi/testUtils/ClientBusinessTest.java [moved from tests/org/cacert/gigi/testUtils/ClientBusinessTest.java with 74% similarity]
tests/club/wpia/gigi/testUtils/ClientTest.java [moved from tests/org/cacert/gigi/testUtils/ClientTest.java with 94% similarity]
tests/club/wpia/gigi/testUtils/ConfiguredTest.java [moved from tests/org/cacert/gigi/testUtils/ConfiguredTest.java with 90% similarity]
tests/club/wpia/gigi/testUtils/IOUtils.java [moved from tests/org/cacert/gigi/testUtils/IOUtils.java with 98% similarity]
tests/club/wpia/gigi/testUtils/InitTruststore.java [moved from tests/org/cacert/gigi/testUtils/InitTruststore.java with 88% similarity]
tests/club/wpia/gigi/testUtils/MailReceiver.java [moved from tests/org/cacert/gigi/testUtils/MailReceiver.java with 70% similarity]
tests/club/wpia/gigi/testUtils/ManagedTest.java [moved from tests/org/cacert/gigi/testUtils/ManagedTest.java with 96% similarity]
tests/club/wpia/gigi/testUtils/OrgTest.java [moved from tests/org/cacert/gigi/testUtils/OrgTest.java with 68% similarity]
tests/club/wpia/gigi/testUtils/PingTest.java [moved from tests/org/cacert/gigi/testUtils/PingTest.java with 92% similarity]
tests/club/wpia/gigi/testUtils/RegisteredUser.java [moved from tests/org/cacert/gigi/testUtils/RegisteredUser.java with 90% similarity]
tests/club/wpia/gigi/testUtils/RestrictedApiTest.java [moved from tests/org/cacert/gigi/testUtils/RestrictedApiTest.java with 79% similarity]
tests/club/wpia/gigi/testUtils/TestEmailReceiver.java [moved from tests/org/cacert/gigi/testUtils/TestEmailReceiver.java with 98% similarity]
tests/club/wpia/gigi/util/EditDistanceTest.java [moved from tests/org/cacert/gigi/util/EditDistanceTest.java with 96% similarity]
tests/club/wpia/gigi/util/TestCAAValidation.java [moved from tests/org/cacert/gigi/util/TestCAAValidation.java with 81% similarity]
tests/club/wpia/gigi/util/TestHTMLEncoder.java [moved from tests/org/cacert/gigi/util/TestHTMLEncoder.java with 90% similarity]
tests/club/wpia/gigi/util/TestNotary.java [moved from tests/org/cacert/gigi/util/TestNotary.java with 91% similarity]
tests/club/wpia/gigi/util/TestPasswordHash.java [moved from tests/org/cacert/gigi/util/TestPasswordHash.java with 90% similarity]
tests/club/wpia/gigi/util/TestPasswordMigration.java [moved from tests/org/cacert/gigi/util/TestPasswordMigration.java with 80% similarity]
tests/club/wpia/gigi/util/TestPasswordStrengthChecker.java [moved from tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java with 93% similarity]
tests/club/wpia/gigi/util/TestPublicSuffixes.java [moved from tests/org/cacert/gigi/util/TestPublicSuffixes.java with 97% similarity]
tests/club/wpia/gigi/util/TestPublicSuffixes.txt [moved from tests/org/cacert/gigi/util/TestPublicSuffixes.txt with 100% similarity]
util-testing/club/wpia/gigi/DevelLauncher.java [moved from util-testing/org/cacert/gigi/DevelLauncher.java with 93% similarity]
util-testing/club/wpia/gigi/DevelTicketWait.templ [moved from util-testing/org/cacert/gigi/DevelTicketWait.templ with 100% similarity]
util-testing/club/wpia/gigi/GenerateProfileOverview.java [moved from util-testing/org/cacert/gigi/GenerateProfileOverview.java with 94% similarity]
util-testing/club/wpia/gigi/TestLauncher.java [moved from util-testing/org/cacert/gigi/TestLauncher.java with 91% similarity]
util-testing/club/wpia/gigi/email/CommandlineEmailProvider.java [moved from util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java with 92% similarity]
util-testing/club/wpia/gigi/email/DelegateMailProvider.java [moved from util-testing/org/cacert/gigi/email/DelegateMailProvider.java with 94% similarity]
util-testing/club/wpia/gigi/email/TestEmailProvider.java [moved from util-testing/org/cacert/gigi/email/TestEmailProvider.java with 99% similarity]
util-testing/club/wpia/gigi/localisation/FileIterable.java [moved from util-testing/org/cacert/gigi/localisation/FileIterable.java with 97% similarity]
util-testing/club/wpia/gigi/localisation/TaintSource.java [moved from util-testing/org/cacert/gigi/localisation/TaintSource.java with 99% similarity]
util-testing/club/wpia/gigi/localisation/TranslationCollectingVisitor.java [moved from util-testing/org/cacert/gigi/localisation/TranslationCollectingVisitor.java with 98% similarity]
util-testing/club/wpia/gigi/localisation/TranslationCollector.java [moved from util-testing/org/cacert/gigi/localisation/TranslationCollector.java with 97% similarity]
util-testing/club/wpia/gigi/localisation/conf.txt [new file with mode: 0644]
util-testing/club/wpia/gigi/pages/Manager.java [moved from util-testing/org/cacert/gigi/pages/Manager.java with 92% similarity]
util-testing/club/wpia/gigi/pages/Manager.templ [moved from util-testing/org/cacert/gigi/pages/Manager.templ with 100% similarity]
util-testing/club/wpia/gigi/pages/ManagerMails.templ [moved from util-testing/org/cacert/gigi/pages/ManagerMails.templ with 100% similarity]
util-testing/club/wpia/gigi/util/IOUtils.java [moved from util-testing/org/cacert/gigi/util/IOUtils.java with 98% similarity]
util-testing/club/wpia/gigi/util/SimpleSigner.java [moved from util-testing/org/cacert/gigi/util/SimpleSigner.java with 97% similarity]
util-testing/org/cacert/gigi/localisation/conf.txt [deleted file]
util/club/wpia/gigi/util/DatabaseManager.java [moved from util/org/cacert/gigi/util/DatabaseManager.java with 93% similarity]
util/club/wpia/gigi/util/FetchLocales.java [moved from util/org/cacert/gigi/util/FetchLocales.java with 99% similarity]
util/club/wpia/gigi/util/HighFinancialValueFetcher.java [moved from util/org/cacert/gigi/util/HighFinancialValueFetcher.java with 98% similarity]
util/club/wpia/gigi/util/HighFinancialValueFetcherAlexa.java [moved from util/org/cacert/gigi/util/HighFinancialValueFetcherAlexa.java with 94% similarity]
util/club/wpia/gigi/util/HighFinancialValueFetcherUmbrella.java [moved from util/org/cacert/gigi/util/HighFinancialValueFetcherUmbrella.java with 96% similarity]

index c1e59d8a5f427fe670eca33aa0dd7a4221b0be67..e9c35f2feec391ba1e7ede77e21f818a54f35332 100644 (file)
@@ -8,7 +8,7 @@
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="util"/>
        <classpathentry kind="src" path="tests"/>
-       <classpathentry excluding="org/cacert/gigi/locatisation/|org/cacert/gigi/localisation/" kind="src" path="util-testing"/>
+       <classpathentry excluding="club/wpia/gigi/locatisation/|club/wpia/gigi/localisation/" kind="src" path="util-testing"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/MySQL"/>
index 6ab3fcd41b131c8436bfc70851c2a0482c5a6f70..193f64c793e3521c612d19004a8ab465b90dc57e 100644 (file)
@@ -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
index eb6f4320a14c8b0d6fae80e007d2c11adec1213f..c42ec1fc34745185704d313a44def36b341bf51c 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="develop" name="cacert-gigi" xmlns:jacoco="antlib:org.jacoco.ant">
+<project basedir="." default="develop" name="gigi" xmlns:jacoco="antlib:org.jacoco.ant">
 
        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
                <classpath path="/usr/share/java/jacocoant.jar" />
        </taskdef>
 
        <property environment="env" />
-       <property name="PACKAGE" value="cacert-gigi" />
+       <property name="PACKAGE" value="gigi" />
        <property name="junit.output.dir" value="junit" />
        <property name="debuglevel" value="source,lines,vars" />
        <property name="target" value="1.8" />
                <pathelement location="${juintexec}/junit4.jar" />
                <pathelement location="${juintexec}/hamcrest-core.jar" />
        </path>
-       <path id="cacert-gigi.classpath">
+       <path id="gigi.classpath">
                <pathelement location="bin" />
                <pathelement location="binutil" />
                <pathelement location="${sqlconnector}" />
        </path>
-       <path id="cacert-gigi.test.classpath">
+       <path id="gigi.test.classpath">
                <pathelement location="bintest" />
                <pathelement location="bin" />
                <pathelement location="binutil" />
@@ -30,7 +30,7 @@
                <path refid="JUnit 4.libraryclasspath" />
                <pathelement location="${sqlconnector}" />
        </path>
-       <path id="cacert-gigi.test.classpath.jdt">
+       <path id="gigi.test.classpath.jdt">
                <pathelement location="${jdt}" />
        </path>
        <target name="init">
@@ -86,7 +86,7 @@
                        <arg line="HEAD"/>
                </exec>
                <manifest file="Gigi.MF">
-                       <attribute name="Main-Class" value="org.cacert.gigi.Launcher" />
+                       <attribute name="Main-Class" value="club.wpia.gigi.Launcher" />
                        <attribute name="Implementation-Version" value="${git-version}" />
                </manifest>
                <echo message="${ant.project.name}: ${ant.file}" />
                        <src path="lib/scrypt" />
                        <src path="lib/json" />
                        <src path="src" />
-                       <classpath refid="cacert-gigi.classpath" />
+                       <classpath refid="gigi.classpath" />
                </javac>
                <javac encoding="UTF-8" debug="true" debuglevel="${debuglevel}" destdir="binutil"
                        includeantruntime="false" source="${source}" target="${target}">
                        <compilerarg value="-XDignore.symbol.file"/>
                        <src path="util" />
-                       <classpath refid="cacert-gigi.classpath" />
+                       <classpath refid="gigi.classpath" />
                </javac>
        </target>
        <target depends="init, build-project" name="build-testing">
                        includeantruntime="false" source="${source}" target="${target}">
                        <compilerarg value="-XDignore.symbol.file"/>
                        <src path="util-testing" />
-                       <exclude name="org/cacert/gigi/localisation/**"/>
-                       <classpath refid="cacert-gigi.classpath" />
+                       <exclude name="club/wpia/gigi/localisation/**"/>
+                       <classpath refid="gigi.classpath" />
                </javac>
        </target>
        <target depends="init, build-project" name="build-testing-l10n">
                        includeantruntime="false" source="${source}" target="${target}">
                        <compilerarg value="-XDignore.symbol.file"/>
                        <src path="util-testing" />
-                       <include name="org/cacert/gigi/localisation/**"/>
-                       <classpath refid="cacert-gigi.classpath" />
-                       <classpath refid="cacert-gigi.test.classpath.jdt" />
+                       <include name="club/wpia/gigi/localisation/**"/>
+                       <classpath refid="gigi.classpath" />
+                       <classpath refid="gigi.test.classpath.jdt" />
                </javac>
-               <java classname="org.cacert.gigi.localisation.TranslationCollector" failonerror="true">
-                       <arg value="util-testing/org/cacert/gigi/localisation/conf.txt"/>
+               <java classname="club.wpia.gigi.localisation.TranslationCollector" failonerror="true">
+                       <arg value="util-testing/club/wpia/gigi/localisation/conf.txt"/>
                        <arg value="."/>
                        <arg value="messages.po"/>
-                       <classpath refid="cacert-gigi.test.classpath" />
-                       <classpath refid="cacert-gigi.test.classpath.jdt" />
+                       <classpath refid="gigi.test.classpath" />
+                       <classpath refid="gigi.test.classpath.jdt" />
                </java>
        </target>
 
 
        <target depends="test,native" name="bundle">
                <zip destfile="gigi-linux_amd64.zip" basedir="."
-                       includes="gigi.jar,native/*.so,src/org/cacert/gigi/database/tableStructure.sql,static/**,templates/**" />
+                       includes="gigi.jar,native/*.so,src/club/wpia/gigi/database/tableStructure.sql,static/**,templates/**" />
        </target>
        <target name="static-bundle">
                <mkdir dir="work"/>
                <move file="work/static/static/images/cacert4-test.png" tofile="work/static/static/images/cacert4.png"/>
                <delete file="work/static/static/image/cacert4-test.png"/>
                <tar destfile="static.tar.gz" compression="gzip" basedir="work"
-                       includes="../src/org/cacert/gigi/database/tableStructure.sql,**,templates/**" />
+                       includes="../src/club/wpia/gigi/database/tableStructure.sql,**,templates/**" />
        </target>
 
        <target name="static-bundle-release">
                </copy>
                <delete file="work/static/static/image/cacert4-test.png"/>
                <tar destfile="static.tar.gz" compression="gzip" basedir="work"
-                       includes="../src/org/cacert/gigi/database/tableStructure.sql,**,templates/**" />
+                       includes="../src/club/wpia/gigi/database/tableStructure.sql,**,templates/**" />
        </target>
 
        <target name="develop" depends="bundle,static-bundle" />
                        includeantruntime="false" source="${source}" target="${target}">
                        <compilerarg value="-XDignore.symbol.file"/>
                        <src path="tests" />
-                       <classpath refid="cacert-gigi.test.classpath" />
+                       <classpath refid="gigi.test.classpath" />
                </javac>
-               <concat destfile="bintest/org/cacert/gigi/util/effective_tld_names.dat">
-                       <path path="bin/org/cacert/gigi/util/effective_tld_names.dat"/>
+               <concat destfile="bintest/club/wpia/gigi/util/effective_tld_names.dat">
+                       <path path="bin/club/wpia/gigi/util/effective_tld_names.dat"/>
                        <path path="publicSuffixFooter.dat"/>
                </concat>
        </target>
                <available file="locale/de.xml" property="locale.present" />
        </target>
        <target name="FetchLocales" depends="check-locale" unless="locale.present">
-               <java classname="org.cacert.gigi.util.FetchLocales" failonerror="true"
+               <java classname="club.wpia.gigi.util.FetchLocales" failonerror="true"
                        fork="yes">
-                       <classpath refid="cacert-gigi.classpath" />
+                       <classpath refid="gigi.classpath" />
                        <arg value="${localePath}"/>
                </java>
        </target>
        </target>
        <target name="reset-db" depends="build-project">
                <copy file="config/test.properties" tofile="config/gigi.properties"/>
-               <java classname="org.cacert.gigi.util.DatabaseManager">
+               <java classname="club.wpia.gigi.util.DatabaseManager">
                        <arg value="--test"/>
-                       <classpath refid="cacert-gigi.test.classpath" />
+                       <classpath refid="gigi.test.classpath" />
                </java>
        </target>
        <target name="test" depends="build-project-test,FetchLocales,pack-testing,pack,reset-db">
                                        <exclude name="**/com/lambdaworks/crypto/test/CryptoTestUtil.java"/>
                                </fileset>
                        </batchtest>
-                       <classpath refid="cacert-gigi.test.classpath" />
+                       <classpath refid="gigi.test.classpath" />
                </junit>
        </target>
        <target name="junitreport">
                                <file file="merged.exec" />
                        </executiondata>
 
-                       <structure name="CAcert gigi">
+                       <structure name="Gigi">
                                <group name="Server">
                                        <classfiles>
                                                <fileset dir="bin">
-                                                       <include name="org/cacert/gigi/**"/>
+                                                       <include name="club/wpia/gigi/**"/>
                                                </fileset>
                                        </classfiles>
                                        <sourcefiles encoding="UTF-8">
                                                <fileset dir="src">
-                                                       <include name="org/cacert/gigi/**"/>
+                                                       <include name="club/wpia/gigi/**"/>
                                                </fileset>
                                        </sourcefiles>
                                </group>
                                <group name="Testcases">
                                        <classfiles>
                                                <fileset dir="bintest">
-                                                       <include name="org/cacert/gigi/**"/>
+                                                       <include name="club/wpia/gigi/**"/>
                                                </fileset>
                                        </classfiles>
                                        <sourcefiles encoding="UTF-8">
                                                <fileset dir="tests">
-                                                       <include name="org/cacert/gigi/**"/>
+                                                       <include name="club/wpia/gigi/**"/>
                                                </fileset>
                                        </sourcefiles>
                                </group>
                <copy file="natives/libsetuid.so" todir="${env.DESTDIR}/usr/lib/jni"/>
        </target>
        <target name="install" depends="install-common">
-               <mkdir dir="${env.DESTDIR}/usr/share/cacert-gigi/static" />
-               <copy todir="${env.DESTDIR}/usr/share/cacert-gigi/static">
+               <mkdir dir="${env.DESTDIR}/usr/share/wpia-gigi/static" />
+               <copy todir="${env.DESTDIR}/usr/share/wpia-gigi/static">
                        <fileset dir="static" />
                </copy>
-               <delete file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png" />
+               <delete file="${env.DESTDIR}/usr/share/wpia-gigi/static/static/images/cacert4-test.png" />
                <copy file="gigi.jar" tofile="${env.DESTDIR}/usr/share/java/gigi.jar"/>
        </target>
        <target name="install-testing" depends="install-common">
-               <mkdir dir="${env.DESTDIR}/usr/share/cacert-gigi/static" />
-               <copy todir="${env.DESTDIR}/usr/share/cacert-gigi/static">
+               <mkdir dir="${env.DESTDIR}/usr/share/wpia-gigi/static" />
+               <copy todir="${env.DESTDIR}/usr/share/wpia-gigi/static">
                        <fileset dir="static" />
                </copy>
-               <move file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png" tofile="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4.png" />
-               <delete file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png" />
+               <move file="${env.DESTDIR}/usr/share/wpia-gigi/static/static/images/cacert4-test.png" tofile="${env.DESTDIR}/usr/share/wpia-gigi/static/static/images/cacert4.png" />
+               <delete file="${env.DESTDIR}/usr/share/wpia-gigi/static/static/images/cacert4-test.png" />
                <copy file="gigi-testing.jar" tofile="${env.DESTDIR}/usr/share/java/gigi.jar"/>
        </target>
 
 
                <chmod file="${env.DESTDIR}/usr/bin/gigi" perm="+x"/>
                <mkdir dir="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/"/>
-               <copy file="src/org/cacert/gigi/database/tableStructure.sql" tofile="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
+               <copy file="src/club/wpia/gigi/database/tableStructure.sql" tofile="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
 
-               <mkdir dir="${env.DESTDIR}/var/lib/cacert-gigi/doc"/>
+               <mkdir dir="${env.DESTDIR}/var/lib/wpia-gigi/doc"/>
                <exec executable="ln">
                        <arg value="-s"/>
                        <arg value="/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
-                       <arg value="${env.DESTDIR}/var/lib/cacert-gigi/doc/tableStructure.sql"/>
+                       <arg value="${env.DESTDIR}/var/lib/wpia-gigi/doc/tableStructure.sql"/>
                </exec>
-               <mkdir dir="${env.DESTDIR}/var/lib/cacert-gigi/natives"/>
-               <delete failonerror="false" file="${env.DESTDIR}/var/lib/cacert-gigi/static"/>
+               <mkdir dir="${env.DESTDIR}/var/lib/wpia-gigi/natives"/>
+               <delete failonerror="false" file="${env.DESTDIR}/var/gigigigi/static"/>
                <exec executable="ln">
                        <arg value="-s"/>
-                       <arg value="/usr/share/cacert-gigi/static"/>
-                       <arg value="${env.DESTDIR}/var/lib/cacert-gigi/static"/>
+                       <arg value="/usr/share/wpia-gigi/static"/>
+                       <arg value="${env.DESTDIR}/var/lib/wpia-gigi/static"/>
                </exec>
                <exec executable="ln">
                        <arg value="-s"/>
                        <arg value="/usr/lib/jni/libsetuid.so"/>
-                       <arg value="${env.DESTDIR}/var/lib/cacert-gigi/natives/libsetuid.so"/>
+                       <arg value="${env.DESTDIR}/var/lib/wpia-gigi/natives/libsetuid.so"/>
                </exec>
 
-               <mkdir dir="${env.DESTDIR}/etc/cacert/gigi"/>
+               <mkdir dir="${env.DESTDIR}/etc/wpia/gigi"/>
                <!--<copy todir="${env.DESTDIR}/DEBIAN">
                        <fileset dir="debian">
                        </fileset>
                </copy>-->
        </target>
        <target name="update-effective-tlds">
-               <mkdir dir="bin/org/cacert/gigi/util"/>
-               <exec executable="wget" dir="bin/org/cacert/gigi/util">
+               <mkdir dir="bin/club/wpia/gigi/util"/>
+               <exec executable="wget" dir="bin/club/wpia/gigi/util">
                        <arg value="-N"/>
                        <arg value="-q"/>
                        <arg value="https://publicsuffix.org/list/effective_tld_names.dat"/>
index 4d7d8fda6c188e385836c80256aa870fd86823bd..3b056e1c275b0e6024c2cd4e2e8687b69fd5cea4 100644 (file)
@@ -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
index 5a7dbaa5e0a222c288bb9c85649c225d324bd2b2..ab65d380cbd6877677602296074318038735ea89 100644 (file)
@@ -1,6 +1,6 @@
 *.debhelper
 *.substvars
 *.log
-cacert-gigi-setuid
+wpia-gigi-setuid
 files
-cacert-gigi
+wpia-gigi
index cc57cffefd31a635a53ed07c0cdc071e57d512ac..198cd0bb49a887deebd0630b35539efb327efd0d 100644 (file)
@@ -1,5 +1,5 @@
-cacert-gigi (0.1) unstable; urgency=low
+wpia-gigi (0.1) unstable; urgency=low
 
   * Initial Release
 
- -- CAcert Software Team <cacert-devel@cacert.org>  Thu, 25 Sep 2014 03:19:20 +0200
+ -- WPIA Software Team <software@wpia.club>  Thu, 25 Sep 2014 03:19:20 +0200
index 8f932faa6d34e4fcd1d68dad9607dfcd756c7451..7a52f97ec976501dd28736f3e771b7a0007c83c1 100644 (file)
@@ -1,29 +1,29 @@
-Source: cacert-gigi
+Source: wpia-gigi
 Section: java
 Priority: optional
-Maintainer: unknown <software@cacert.org>
+Maintainer: unknown <software@wpia.club>
 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.
index c45494825daad0414ee65074dc45885d045cf3d3..3c841acfb493a8c3555b62a2362f6a48b3d1f6f2 100644 (file)
@@ -1,29 +1,29 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gigi
-Source: <https://github.com/CAcertOrg/cacert-gigi>
+Source: <https://code.wpia.club>
 
 Files: *
-Copyright: 2014 CAcert Software Team <cacert-devel@cacert.org>
+Copyright: 2014 WPIA Software Team <software@wpia.club>
 License: GPL-2.0
 
 Files: debian/*
-Copyright: 2014 CAcert Software Team <cacert-devel@cacert.org>
+Copyright: 2014 WPIA Software Team <software@wpia.club>
 License: GPL-2.0
 
-Files: src/org/cacert/gigi/output/template
-Copyright: 2015 CAcert Software Team <cacert-devel@cacert.org>
+Files: src/club/wpia/gigi/output/template
+Copyright: 2015 WPIA Software Team <software@wpia.club>
 License: GPL-2.0 or BSD
 
-Files: src/org/cacert/gigi/localisation
-Copyright: 2015 CAcert Software Team <cacert-devel@cacert.org>
+Files: src/club/wpia/gigi/localisation
+Copyright: 2015 WPIA Software Team <software@wpia.club>
 License: GPL-2.0 or BSD
 
-Files: src/org/cacert/gigi/database
-Copyright: 2015 CAcert Software Team <cacert-devel@cacert.org>
+Files: src/club/wpia/gigi/database
+Copyright: 2015 WPIA Software Team <software@wpia.club>
 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 
index 52eddbd714b982f598e158bf14a6596d7ca4a4d8..df5d98941665b19b8e8c288b6cabfbc02745835a 100644 (file)
@@ -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
index fe0a7f49b80db5d9e7f3fe91124bcb96d7f7f653..70768b4294378a99ac00f203b6e180bd1efb450b 100644 (file)
@@ -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
index 776625f823b15cc026dafbec93dbb5c028adcad3..9fe1dcf530ff84ab9ccb99ba4820fb017f79f4a4 100644 (file)
@@ -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
index 61b41b69361005cf4d70d775a3ac7cbcbe4c8a3b..d7eaa36957751f3cb3cd7402b0773488d3820e7f 100644 (file)
@@ -1,7 +1,7 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.\" (C) Copyright 2014 CAcert Software Team <software@cacert.org>,
+.\" (C) Copyright 2014-2017 WPIA Software Team <software@wpia.club>,
 .\"
-.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:
 .\" .sp <n>    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<whatever>\fP and
 .\" \fI<whatever>\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
index c384f79f84452f24cf8655cc23fbb378ae588d1b..1491fd406f65a66fcf8452024c8b9a8b11c7fc90 100755 (executable)
@@ -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
 
similarity index 93%
rename from debian/cacert-gigi-testing.postinst
rename to debian/wpia-gigi-testing.postinst
index e5654e3662e63969977a23026e9f18745a1e83d0..f351f03675d94aa29cc08d9fe34df77b8bdef035 100644 (file)
@@ -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
similarity index 69%
rename from debian/cacert-gigi-testing.templates
rename to debian/wpia-gigi-testing.templates
index ddf85d0649e37424f2f4a8751a39ee61a66232ff..2822c59bc14f955621d26af5856098e0c656d87a 100644 (file)
@@ -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
similarity index 93%
rename from debian/cacert-gigi.postinst
rename to debian/wpia-gigi.postinst
index 519ecc489894aba810fb642782df6f78e6e4e1de..af5a8de925b855783b41605e21e51bb1876edc63 100644 (file)
@@ -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
similarity index 73%
rename from debian/cacert-gigi.templates
rename to debian/wpia-gigi.templates
index e47d9cc4f410cbb79d5388347fcd77b4f59ee5cc..15f2582c54ea7c2758787e808bbc193a5a678cb6 100644 (file)
@@ -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
index 809d70e7d2500d5385f4a681134b942e8ebb04b9..8446f058e4d7742eb29004774abdebbe14c6a089 100644 (file)
@@ -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)
index 0a4ee3d81d0f9baf70e8adac0728da2eeb4db99c..ba3677e04d64c67955c5f716f0b089e5d63d5aec 100755 (executable)
@@ -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</etc/cacert/gigi/conf.tar || die 'open config'
-        exec 4>>/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 ;;
index 4fa62a79922a3b1fa3be66e065f113bf8fcc3f8c..cc72469b4ee6c355066bfa2e1b5fc580d3774fb9 100644 (file)
@@ -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:
similarity index 87%
rename from natives/org_cacert_gigi_natives_SetUID.c
rename to natives/club_wpia_gigi_natives_SetUID.c
index 1b2350b4ab856102906013b6fcf80dfe8b0e6da5..c0034677b77b8316fe1df3cb210a27da359b8cbe 100644 (file)
@@ -3,8 +3,8 @@
 
 #include <unistd.h>
 
-#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, "<init>", "(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 */
similarity index 84%
rename from src/org/cacert/gigi/Gigi.java
rename to src/club/wpia/gigi/Gigi.java
index c7a607940c0684709a511390fc36057593e82a23..f8f931a63f9abd45a1ebfcaf702c673827de60fb 100644 (file)
@@ -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();
     }
 
similarity index 94%
rename from src/org/cacert/gigi/GigiApiException.java
rename to src/club/wpia/gigi/GigiApiException.java
index 7b3a990938ad0df650ec2b9c5079124f6d7286ee..0e1a1b7f5176a63396a5e5663e7eceb0ab4f369a 100644 (file)
@@ -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 {
 
similarity index 99%
rename from src/org/cacert/gigi/GigiConfig.java
rename to src/club/wpia/gigi/GigiConfig.java
index 8b7c220202f83e8b3b07724fb57824c9fb49f368..56f46cab6ebd77f7ff59d31731925e9f9a39e9a5 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package club.wpia.gigi;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
similarity index 98%
rename from src/org/cacert/gigi/Launcher.java
rename to src/club/wpia/gigi/Launcher.java
index 7c588d8e95a28b49183735478489b2f09e6309f0..a1cd26938edf91818e58e3ea14ff0c9c3ec09d71 100644 (file)
@@ -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 {
similarity index 57%
rename from src/org/cacert/gigi/PermissionCheckable.java
rename to src/club/wpia/gigi/PermissionCheckable.java
index 4b868f2a069498ba2126ee7133b02d4c6040291d..ccdcb3685c2ae807bebab9262180066adcb493ce 100644 (file)
@@ -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 {
 
similarity index 97%
rename from src/org/cacert/gigi/PolicyRedirector.java
rename to src/club/wpia/gigi/PolicyRedirector.java
index e907c37620771015e4fe03780cc2fc73cfc3684c..9326f4f237bd15220cf40d4060a67ddd9286378b 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package club.wpia.gigi;
 
 import java.io.IOException;
 
similarity index 91%
rename from src/org/cacert/gigi/api/APIPoint.java
rename to src/club/wpia/gigi/api/APIPoint.java
index 72a555b1539a5a89ba51f2bb564c9d1453877f68..737426a733fa8bf7d22cc21f267e3911bd509693 100644 (file)
@@ -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 {
 
similarity index 91%
rename from src/org/cacert/gigi/api/CATSImport.java
rename to src/club/wpia/gigi/api/CATSImport.java
index afa0f2a6fdbc6fd73896e06e0ca22b667e51ba49..9bb39abcf9d3ff85047f2ffc0be0e6d8d9dd590d 100644 (file)
@@ -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 {
 
similarity index 85%
rename from src/org/cacert/gigi/api/CATSResolve.java
rename to src/club/wpia/gigi/api/CATSResolve.java
index 6e7c83dd58aafb035c779f318f288b86e63fd43a..f326fb4e45c2fd4efb09be45dc3b1e758910ee50 100644 (file)
@@ -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 {
 
similarity index 78%
rename from src/org/cacert/gigi/api/CATSRestrictedApi.java
rename to src/club/wpia/gigi/api/CATSRestrictedApi.java
index b7ff83a9753df78b0439a854f69d59a34e50f258..971884cb58a82fd07659502411af5fb668d955f0 100644 (file)
@@ -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 {
 
similarity index 83%
rename from src/org/cacert/gigi/api/CreateCertificate.java
rename to src/club/wpia/gigi/api/CreateCertificate.java
index a939b9e6c7844e4fd9c9b30f06886a43286fba83..6af284c032e19aedc93d6097aa8ee00a922f77b2 100644 (file)
@@ -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 {
 
similarity index 85%
rename from src/org/cacert/gigi/api/EmailReping.java
rename to src/club/wpia/gigi/api/EmailReping.java
index e2c3383f391242a546014cb6116bf0604b87adfc..7ae012b0404edcefed703ea82248764e5959954e 100644 (file)
@@ -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 {
 
similarity index 91%
rename from src/org/cacert/gigi/api/Emails.java
rename to src/club/wpia/gigi/api/Emails.java
index 6641a8e6fa5940a37d5058ce03ef7b644266db44..21983cc06df8672bc2aa87c0311ce74047c995ee 100644 (file)
@@ -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";
similarity index 91%
rename from src/org/cacert/gigi/api/FindAgent.java
rename to src/club/wpia/gigi/api/FindAgent.java
index ba58a7a3383af75631480e278ead2df48b821514..bb2a57823edf0fbf5f499530568a07c6a3ff7295 100644 (file)
@@ -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";
similarity index 93%
rename from src/org/cacert/gigi/api/GigiAPI.java
rename to src/club/wpia/gigi/api/GigiAPI.java
index bd6884f9855827f123d0f03c507e99f1ae6cdb1c..1f99e510c1de99fe429c2152d7cb61b4fba3a8f6 100644 (file)
@@ -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 {
 
similarity index 85%
rename from src/org/cacert/gigi/api/RevokeCertificate.java
rename to src/club/wpia/gigi/api/RevokeCertificate.java
index 2f15511afe69af95179e9678b6a6f231b15918b9..1b21e240f4f7d1877eab27bd8803afd114e27758 100644 (file)
@@ -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 {
 
similarity index 98%
rename from src/org/cacert/gigi/crypto/SMIME.java
rename to src/club/wpia/gigi/crypto/SMIME.java
index de39f5a190793e267e16828f027d9cbcba86e220..1bfbf08bde14132cadaa7d35ce7108adaa4913c4 100644 (file)
@@ -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;
similarity index 98%
rename from src/org/cacert/gigi/crypto/SPKAC.java
rename to src/club/wpia/gigi/crypto/SPKAC.java
index c97f5acf2a8571e940fbfcc6d83fac7271eed3ab..77c7e2c069d0bdd7dbc31f9a0a2dd82cc49f461b 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.crypto;
+package club.wpia.gigi.crypto;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
similarity index 64%
rename from src/org/cacert/gigi/database/DBEnum.java
rename to src/club/wpia/gigi/database/DBEnum.java
index 72c45a1640b7e2c0e0156f27ae160317dc48dea6..8f2dc77618997f9dca997f892ca36df09985793e 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.database;
+package club.wpia.gigi.database;
 
 public interface DBEnum {
 
similarity index 99%
rename from src/org/cacert/gigi/database/DatabaseConnection.java
rename to src/club/wpia/gigi/database/DatabaseConnection.java
index 2bdf9f1ca1ab1cb7fe694569655547c6a400b493..0d595707fee890f628471f7e168dc72e57169fbd 100644 (file)
@@ -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 {
 
similarity index 99%
rename from src/org/cacert/gigi/database/GigiPreparedStatement.java
rename to src/club/wpia/gigi/database/GigiPreparedStatement.java
index 4dea5f981f68eb28679734eb1ed88c74e2dc7328..4957d4d3edbb8221b53fa3ad369dab99b1698759 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.database;
+package club.wpia.gigi.database;
 
 import java.sql.Date;
 import java.sql.PreparedStatement;
similarity index 99%
rename from src/org/cacert/gigi/database/GigiResultSet.java
rename to src/club/wpia/gigi/database/GigiResultSet.java
index d31c9ccb78ef83079c16eb02f8c04bc47d984536..d71d57cf258ad3215e93985d1f99c7c64e459edd 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.database;
+package club.wpia.gigi.database;
 
 import java.io.Closeable;
 import java.sql.Date;
similarity index 98%
rename from src/org/cacert/gigi/database/SQLFileManager.java
rename to src/club/wpia/gigi/database/SQLFileManager.java
index 61732182015ddcd007b4b3892750415ab949e8e1..3364924744e1e94bab48ab5cf664453c2cabf569 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.database;
+package club.wpia.gigi.database;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
similarity index 93%
rename from src/org/cacert/gigi/dbObjects/Assurance.java
rename to src/club/wpia/gigi/dbObjects/Assurance.java
index 07c3a39be3b721fc10287181aa591087e408a86b..77d8098b7038f3c2603163e037ce6b9fbc1ad4ac 100644 (file)
@@ -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 {
similarity index 97%
rename from src/org/cacert/gigi/dbObjects/CACertificate.java
rename to src/club/wpia/gigi/dbObjects/CACertificate.java
index bc96a5a5f3db89b0188e2d9075ac068c2b77fa2d..a1a8f9bd3d54b5e50c1639bcef3b47342c4baa04 100644 (file)
@@ -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 {
 
similarity index 94%
rename from src/org/cacert/gigi/dbObjects/CATS.java
rename to src/club/wpia/gigi/dbObjects/CATS.java
index df85172871cee09413a02baa34914419b7539208..3ed2c9230b734cb0f8d14a7e255d41f2dd5ef7d0 100644 (file)
@@ -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 {
 
similarity index 97%
rename from src/org/cacert/gigi/dbObjects/Certificate.java
rename to src/club/wpia/gigi/dbObjects/Certificate.java
index 2aecedf75e295f4a6af95fec61af7006bfafd3ac..72cd3c19d57ad77c7adf8efc7f2e3adfc54c033c 100644 (file)
@@ -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 {
 
similarity index 96%
rename from src/org/cacert/gigi/dbObjects/CertificateOwner.java
rename to src/club/wpia/gigi/dbObjects/CertificateOwner.java
index a66229fe6bdefa90a8d6ef9df07d1f9341e87d11..1783394cd6cfdf6add3c4f0867393bc46d568f08 100644 (file)
@@ -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 {
 
similarity index 98%
rename from src/org/cacert/gigi/dbObjects/CertificateProfile.java
rename to src/club/wpia/gigi/dbObjects/CertificateProfile.java
index afcc019c417b172308d5092921df3e020e7879c5..8940da386a0d949755f831687acf005871a718c5 100644 (file)
@@ -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 {
 
similarity index 95%
rename from src/org/cacert/gigi/dbObjects/Country.java
rename to src/club/wpia/gigi/dbObjects/Country.java
index dedaa7e00f0bcc2f1962af801efee4c87ec712b2..0501fccf2b1018766e120c411e3531001625d609 100644 (file)
@@ -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.
similarity index 76%
rename from src/org/cacert/gigi/dbObjects/Digest.java
rename to src/club/wpia/gigi/dbObjects/Digest.java
index 1bf2b77b74b84a593b0ad8bee0c5f8da6beb9d50..19c61633045ecc89ba59b6ba2284ec4d28da7019 100644 (file)
@@ -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("!'<a href='//links.teracara.org/sha2-256'>", "!'</a>"))),
     SHA384("Best matched with ECC P-384"),
similarity index 97%
rename from src/org/cacert/gigi/dbObjects/Domain.java
rename to src/club/wpia/gigi/dbObjects/Domain.java
index f7c963c9e40e83c1033943d0d5d6f3004ac5add2..d7de209c28ae069e1c03e29d9a6417f858b4032b 100644 (file)
@@ -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 {
 
similarity index 91%
rename from src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
rename to src/club/wpia/gigi/dbObjects/DomainPingConfiguration.java
index 772b066f173db45cb0535d2d110b1a7faa8a86bc..bdaad75880a5acb1e0c9dd09428a9be7597df19e 100644 (file)
@@ -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 {
 
similarity index 91%
rename from src/org/cacert/gigi/dbObjects/DomainPingExecution.java
rename to src/club/wpia/gigi/dbObjects/DomainPingExecution.java
index 8512285448e598eb4cf3feab9dbe262973f1e7b5..174b2a182825f1f61e6b30abfa1f5b89c66c168d 100644 (file)
@@ -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 {
 
similarity index 69%
rename from src/org/cacert/gigi/dbObjects/DomainPingType.java
rename to src/club/wpia/gigi/dbObjects/DomainPingType.java
index d86970b7690155ee1330c4c0126ec2ea3d770b45..3f4b474ab39c5564728651b2f6ea7ca8ae59583c 100644 (file)
@@ -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;
similarity index 94%
rename from src/org/cacert/gigi/dbObjects/EmailAddress.java
rename to src/club/wpia/gigi/dbObjects/EmailAddress.java
index 7847035914140891a829d1e18daedbd968b1fd0e..319e415b93e86a97d89da13ddcf5b18e8df12ec8 100644 (file)
@@ -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 {
 
similarity index 93%
rename from src/org/cacert/gigi/dbObjects/Group.java
rename to src/club/wpia/gigi/dbObjects/Group.java
index 91becaf8c84d97b518810f3281f6cd08d9b066e4..1acc461b3e915d2b85cb6e786486396aa5ad6578 100644 (file)
@@ -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), //
similarity index 62%
rename from src/org/cacert/gigi/dbObjects/IdCachable.java
rename to src/club/wpia/gigi/dbObjects/IdCachable.java
index af439bcfb910cf3ddc02e2ea44e43dea88a9ad28..3dc3d80e1fc290940b76f86a65cbc44fc84c1395 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.dbObjects;
+package club.wpia.gigi.dbObjects;
 
 public interface IdCachable {
 
similarity index 91%
rename from src/org/cacert/gigi/dbObjects/Job.java
rename to src/club/wpia/gigi/dbObjects/Job.java
index 4fa297385642573f19187d2a92dd7ed94bacc041..ea8fc97d560215facf75b73c94e99fea143a31da 100644 (file)
@@ -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 {
 
similarity index 97%
rename from src/org/cacert/gigi/dbObjects/Name.java
rename to src/club/wpia/gigi/dbObjects/Name.java
index df9e1ff6f19660005f115cd63b23624bba06697b..f4d002ec427c967772a6e03fa59d123bedfb23c7 100644 (file)
@@ -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 {
 
similarity index 91%
rename from src/org/cacert/gigi/dbObjects/NamePart.java
rename to src/club/wpia/gigi/dbObjects/NamePart.java
index 25a0a546aac0ed6929e73136fc55a16ec655639a..8889f8ade5d7432df3cd41c53d4a5383937e51b2 100644 (file)
@@ -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 {
similarity index 96%
rename from src/org/cacert/gigi/dbObjects/ObjectCache.java
rename to src/club/wpia/gigi/dbObjects/ObjectCache.java
index 125477defc5fd26e33bff9d51153d9617c06a15b..cc2e1ea3deb82acf2b7912d9a35bfd2561fd04b4 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.dbObjects;
+package club.wpia.gigi.dbObjects;
 
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
similarity index 96%
rename from src/org/cacert/gigi/dbObjects/Organisation.java
rename to src/club/wpia/gigi/dbObjects/Organisation.java
index cb6601e68dffb2457dd42140b30f2372650ce675..6e48185568eee3b8bde60282dba52f68bab0aaea 100644 (file)
@@ -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 {
 
similarity index 93%
rename from src/org/cacert/gigi/dbObjects/SupportedUser.java
rename to src/club/wpia/gigi/dbObjects/SupportedUser.java
index e600b85bf2d2fca302375d18e06693e19108c056..c9364f4ef63ad96cbf0fd14c10c2bcbcb5d7c167 100644 (file)
@@ -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 {
 
similarity index 96%
rename from src/org/cacert/gigi/dbObjects/User.java
rename to src/club/wpia/gigi/dbObjects/User.java
index ad2d38675c64329da0eef5d6c2e16974c8e1c061..1172c7e4ad540064f2cbd41c1fe18c9b054cf56a 100644 (file)
@@ -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
similarity index 68%
rename from src/org/cacert/gigi/dbObjects/Verifyable.java
rename to src/club/wpia/gigi/dbObjects/Verifyable.java
index ba4dd0c58bca4904dc67f6d21212e906defe3365..7bbd35468ee73ba0cc75b31f56863c1c6fbe8946 100644 (file)
@@ -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 {
 
similarity index 76%
rename from src/org/cacert/gigi/dbObjects/wrappers/DataContainer.java
rename to src/club/wpia/gigi/dbObjects/wrappers/DataContainer.java
index db14af6093dc8063058da5a9f9dd6bd8af4cf14d..62d10e154fe2e0bdb57dad7107231044bdec6519 100644 (file)
@@ -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;
similarity index 96%
rename from src/org/cacert/gigi/email/EmailProvider.java
rename to src/club/wpia/gigi/email/EmailProvider.java
index c053caf8151cc7278c61adc092812c8bfa47ac78..c6bef2f9e4df9786ad0f2125d01c079808be5f15 100644 (file)
@@ -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 {
 
similarity index 76%
rename from src/org/cacert/gigi/email/MailProbe.java
rename to src/club/wpia/gigi/email/MailProbe.java
index 4da2648ae83d36f6eed4138829c390e7be839620..4ecd2980909090dc603b4ff83c9d09c20130f04a 100644 (file)
@@ -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 {
 
similarity index 96%
rename from src/org/cacert/gigi/email/SendMail.java
rename to src/club/wpia/gigi/email/SendMail.java
index 81d26ca5a41d17d3816a41fb19ac1861ff51afac..cef6381c6311ab25b0ff5ebab8eaf5e13161f2f5 100644 (file)
@@ -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 {
 
similarity index 99%
rename from src/org/cacert/gigi/localisation/Language.java
rename to src/club/wpia/gigi/localisation/Language.java
index 4caaa79beb698533b0bb8de4f26f4aeb12945a67..3cdb7d19207ef728df54a0a43eb3d9c0889a4640 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.localisation;
+package club.wpia.gigi.localisation;
 
 import java.io.File;
 import java.io.FileInputStream;
similarity index 95%
rename from src/org/cacert/gigi/natives/SetUID.java
rename to src/club/wpia/gigi/natives/SetUID.java
index a4a5d8595eaf71f64ea6a31eed4ee5efb2fe929c..dbc318ac5f3e185e77c478cbcba78fa8b20dee27 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.natives;
+package club.wpia.gigi.natives;
 
 import java.io.File;
 
similarity index 78%
rename from src/org/cacert/gigi/output/ArrayIterable.java
rename to src/club/wpia/gigi/output/ArrayIterable.java
index 90bad4363743f8fd03df016cd6512ecbdc6015b0..29fa84159df3377f3241e1a722bd7bec28c0d524 100644 (file)
@@ -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<T> implements IterableDataset {
 
similarity index 90%
rename from src/org/cacert/gigi/output/AssurancesDisplay.java
rename to src/club/wpia/gigi/output/AssurancesDisplay.java
index 86034158e64a55cb0fee246d9f4e967d331a47b2..84822dd61632f045aaacefc09fa9c266347c658c 100644 (file)
@@ -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 {
 
similarity index 89%
rename from src/org/cacert/gigi/output/CertificateIterable.java
rename to src/club/wpia/gigi/output/CertificateIterable.java
index 9e55141155d9f25fd9bcd59bccb998b91f635a5a..6d12a3da2d1e190a4d859c8c60ff098046406a81 100644 (file)
@@ -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 {
 
similarity index 95%
rename from src/org/cacert/gigi/output/CertificateValiditySelector.java
rename to src/club/wpia/gigi/output/CertificateValiditySelector.java
index d0f0c124a38cfc135fe276218094284bb2fbd5b7..2ae555d3b6c1508dc1fcc94c87f90d037a9ca5ac 100644 (file)
@@ -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 {
 
similarity index 85%
rename from src/org/cacert/gigi/output/ClientCSRGenerate.java
rename to src/club/wpia/gigi/output/ClientCSRGenerate.java
index 3d4418e176257bfc4a13f745e17f3ab420f870f4..1eaa6421d52b89a6d00da799a4844ee46a136b3a 100644 (file)
@@ -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 {
 
similarity index 85%
rename from src/org/cacert/gigi/output/CountrySelector.java
rename to src/club/wpia/gigi/output/CountrySelector.java
index bb1fab920e661dca205f49173c59fe54413161da..03d85d5ded86092b379f08558405f019e57b3e1f 100644 (file)
@@ -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 {
 
similarity index 93%
rename from src/org/cacert/gigi/output/DateSelector.java
rename to src/club/wpia/gigi/output/DateSelector.java
index 2557282abe8dad4b8737b9ff6fd6baa0e972d6d4..bb9c8ab6f134d16899d13ac512c5d500f399d504 100644 (file)
@@ -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 {
 
similarity index 81%
rename from src/org/cacert/gigi/output/GroupIterator.java
rename to src/club/wpia/gigi/output/GroupIterator.java
index 4e35db483e9b51a16f617df0bfd1d8d9eaf810e8..d195c6ca6652ce4da98487dcc4ca6e03da387abc 100644 (file)
@@ -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 {
 
similarity index 86%
rename from src/org/cacert/gigi/output/GroupSelector.java
rename to src/club/wpia/gigi/output/GroupSelector.java
index 9d3080ddc1aaf3646ebc08631d6edd3553affc7e..ace2193f03ffd2a09aef7e2976f7f9c5e34b3709 100644 (file)
@@ -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 {
 
similarity index 79%
rename from src/org/cacert/gigi/output/HashAlgorithms.java
rename to src/club/wpia/gigi/output/HashAlgorithms.java
index fe29d62512717f2383b826d498b5d1161bb085a8..e6d670d9fd27c9947c5d233055e580ac332c7a5a 100644 (file)
@@ -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 {
 
similarity index 58%
rename from src/org/cacert/gigi/output/IMenuItem.java
rename to src/club/wpia/gigi/output/IMenuItem.java
index 5e85f627c3b9a108069340827d458e763ecc7a61..105c87069081de3fa6df632d372002212595ee61 100644 (file)
@@ -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}.
similarity index 80%
rename from src/org/cacert/gigi/output/IterableIterable.java
rename to src/club/wpia/gigi/output/IterableIterable.java
index bf2ab07b4a1189cb2765deb0bf6fb4ed6f4b84f1..28ba657a410fd213569e09de703546fb4836fa08 100644 (file)
@@ -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<T> implements IterableDataset {
 
similarity index 93%
rename from src/org/cacert/gigi/output/Menu.java
rename to src/club/wpia/gigi/output/Menu.java
index f351b7326c94c2310e9677091b9d2cb879fc5c74..e83ce6e0155573ad28108e27658bcdd07b3eebfd 100644 (file)
@@ -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 {
 
similarity index 81%
rename from src/org/cacert/gigi/output/MenuCollector.java
rename to src/club/wpia/gigi/output/MenuCollector.java
index 7a5a0599b20519284acde48fb88e2a47da6006b5..d5280f0a31bea71481c1560764ee4a18672a6db6 100644 (file)
@@ -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 {
 
similarity index 89%
rename from src/org/cacert/gigi/output/NameInput.java
rename to src/club/wpia/gigi/output/NameInput.java
index 11415443b99630297b64217448d11810f16278e7..11c8de57097ed863571a84b2482527d51f1f4a1e 100644 (file)
@@ -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 {
 
similarity index 75%
rename from src/org/cacert/gigi/output/PageMenuItem.java
rename to src/club/wpia/gigi/output/PageMenuItem.java
index f331e3c643ea45949dcba946216f5527261ec216..fe56d599dfaecc388d51cdccb952e041ed358442 100644 (file)
@@ -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 {
 
similarity index 80%
rename from src/org/cacert/gigi/output/SimpleMenuItem.java
rename to src/club/wpia/gigi/output/SimpleMenuItem.java
index 7def5cab62e048b0c0ba82726b23676d0ef55e11..e95d92ddd5ac1286958a46efcf997873a93c0a3c 100644 (file)
@@ -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 {
 
similarity index 85%
rename from src/org/cacert/gigi/output/SimpleUntranslatedMenuItem.java
rename to src/club/wpia/gigi/output/SimpleUntranslatedMenuItem.java
index 8206a29d091f4b5fd332ef1926eceefa49c31b23..4e11db84cc2fd12e9d84485078a775ca1547ab33 100644 (file)
@@ -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 {
 
similarity index 76%
rename from src/org/cacert/gigi/output/TrustchainIterable.java
rename to src/club/wpia/gigi/output/TrustchainIterable.java
index 2cee5fd5ef6a8384b9edc486eb54f7e2443804ec..23d66bc3d2258866c9481cd0448e3d752bce9a41 100644 (file)
@@ -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 {
 
similarity index 93%
rename from src/org/cacert/gigi/output/template/ForeachStatement.java
rename to src/club/wpia/gigi/output/template/ForeachStatement.java
index 4c8b1027b5f7dfb3df420b309fffe699fad94d26..63487e012af28b3ddeb5e190005cd4517889e13b 100644 (file)
@@ -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
similarity index 97%
rename from src/org/cacert/gigi/output/template/Form.java
rename to src/club/wpia/gigi/output/template/Form.java
index 82d9e60074542ce0900f313d346f3d91b96a1a7c..ec3909e11263da0e5b23e1ebbcf6c4093d9d1744 100644 (file)
@@ -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.
similarity index 95%
rename from src/org/cacert/gigi/output/template/IfStatement.java
rename to src/club/wpia/gigi/output/template/IfStatement.java
index 1b49f3b28f0ae1dad5dfe8526cbd5e347cd9b9e6..8b0af6a6710185e9b4723b18bf14ccecaf0b71db 100644 (file)
@@ -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
similarity index 87%
rename from src/org/cacert/gigi/output/template/IterableDataset.java
rename to src/club/wpia/gigi/output/template/IterableDataset.java
index 26405a54cb4c998cca1b331bb0d9fe9147b15fa9..b553fdbe7fec63b1ca0d570ad8e2017b59f2e984 100644 (file)
@@ -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
similarity index 95%
rename from src/org/cacert/gigi/output/template/MailTemplate.java
rename to src/club/wpia/gigi/output/template/MailTemplate.java
index d1647a8bbe26cee675fb63f88ddcf6c3ee236674..48034601f452013719e841243bed7ade0b6b1d82 100644 (file)
@@ -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 {
 
similarity index 91%
rename from src/org/cacert/gigi/output/template/OutputVariableCommand.java
rename to src/club/wpia/gigi/output/template/OutputVariableCommand.java
index 5dce3aed211c1c45452d96929e6e0c3c9484dabe..54f8dca9b55f61e90c9c1b9c5f82c634e3bbf724 100644 (file)
@@ -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.
similarity index 88%
rename from src/org/cacert/gigi/output/template/Outputable.java
rename to src/club/wpia/gigi/output/template/Outputable.java
index 1e6d9f10041c3552fa80daa91a5cac41d710f889..836a44f4c5694a8c729815db66b8cb5373b6922b 100644 (file)
@@ -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.
similarity index 91%
rename from src/org/cacert/gigi/output/template/OutputableArrayIterable.java
rename to src/club/wpia/gigi/output/template/OutputableArrayIterable.java
index 498954074de111f942da3cf97b9b8a7bf5f0d8cd..ff7886d4d12949f1edef58eb88066e9fa691a225 100644 (file)
@@ -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.
similarity index 78%
rename from src/org/cacert/gigi/output/template/PlainOutputable.java
rename to src/club/wpia/gigi/output/template/PlainOutputable.java
index 3c56b7fabebd2758709be0eef25016683400d4db..a4fdb7cafcb3edd6c418b7ddadd8933d2fadcd5b 100644 (file)
@@ -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 {
 
similarity index 90%
rename from src/org/cacert/gigi/output/template/Scope.java
rename to src/club/wpia/gigi/output/template/Scope.java
index 700ccfe7e9b717229869720ebc61f3eb387a5a41..e962649d23f53503dbfeef5c79cfd100c4b45452 100644 (file)
@@ -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
similarity index 97%
rename from src/org/cacert/gigi/output/template/SprintfCommand.java
rename to src/club/wpia/gigi/output/template/SprintfCommand.java
index 64ede7823776692b11f7e2ba6100e1e07d9d6a3d..6b40c8fd0ab49bd88b6f4c6f4dba4aca934b4dfc 100644 (file)
@@ -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.
similarity index 98%
rename from src/org/cacert/gigi/output/template/Template.java
rename to src/club/wpia/gigi/output/template/Template.java
index 6aa9348a7f1ed942a782b3af59144fc0240e2e29..454c0c5846d4b35df39bf62e44fa8566bc0a7840 100644 (file)
@@ -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.
similarity index 89%
rename from src/org/cacert/gigi/output/template/TemplateBlock.java
rename to src/club/wpia/gigi/output/template/TemplateBlock.java
index 1e3aac0ce5317e5c556c2c102836f8910f72f7be..650a07a844fbe0109b3a0715d2155c8a8b7b694f 100644 (file)
@@ -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 {
 
similarity index 98%
rename from src/org/cacert/gigi/output/template/TemplateParseException.java
rename to src/club/wpia/gigi/output/template/TemplateParseException.java
index e52f11461c6bfebf8355e82a06034bcefaa4fe89..3e700351fefdcfe33758c83e32b33390a0e9c9e1 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.output.template;
+package club.wpia.gigi.output.template;
 
 import java.io.IOException;
 import java.util.Set;
similarity index 91%
rename from src/org/cacert/gigi/output/template/Translatable.java
rename to src/club/wpia/gigi/output/template/Translatable.java
index 4df11474abbbe917d07172d76bffb87771e8b15d..c074fafca26a675af537093ac4a26bcfafdd6571 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.output.template;
+package club.wpia.gigi.output.template;
 
 import java.util.Collection;
 
similarity index 90%
rename from src/org/cacert/gigi/output/template/TranslateCommand.java
rename to src/club/wpia/gigi/output/template/TranslateCommand.java
index 7bb601125101b226e1327a9fa74d56851fb80d69..449942862508f1cc241534c2adfad622bf580895 100644 (file)
@@ -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.
similarity index 81%
rename from src/org/cacert/gigi/pages/AboutPage.java
rename to src/club/wpia/gigi/pages/AboutPage.java
index a4b1d897a78a2b6c9a72e0318b5e8a5e4fa44eac..2b6c2c002efba8408987b7b7c35ab9893f3c66c3 100644 (file)
@@ -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<String, Object> o = new HashMap<>();
-        String version = Package.getPackage("org.cacert.gigi").getImplementationVersion();
+        String version = Package.getPackage("club.wpia.gigi").getImplementationVersion();
         if (version == null) {
             version = "development";
         }
similarity index 89%
rename from src/org/cacert/gigi/pages/HandlesMixedRequest.java
rename to src/club/wpia/gigi/pages/HandlesMixedRequest.java
index 5e15d3841e28babc72bbaced19db8985e07c7262..293ac6eecc6f2fdfb2b3a216f982795ac9e047ff 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.pages;
+package club.wpia.gigi.pages;
 
 import javax.servlet.http.HttpServletRequest;
 
similarity index 89%
rename from src/org/cacert/gigi/pages/LoginPage.java
rename to src/club/wpia/gigi/pages/LoginPage.java
index 29b33aa4b2cba169df38412fcb1864794b9a643b..2af51cf71b937d31c9ebd1497985a6a74273e4a6 100644 (file)
@@ -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 {
 
similarity index 88%
rename from src/org/cacert/gigi/pages/LogoutPage.java
rename to src/club/wpia/gigi/pages/LogoutPage.java
index 6f568f128158a0190305cba5c28ded26a4a7d885..62379e72095f9fd2204ef07c450fd1121b180ca4 100644 (file)
@@ -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 {
 
similarity index 91%
rename from src/org/cacert/gigi/pages/MainPage.java
rename to src/club/wpia/gigi/pages/MainPage.java
index 0cccbfb535ec223c452f0b132f0ad55a6d8d95ed..f797a1937d04daadcd24131c6eb09efa3b8b35eb 100644 (file)
@@ -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 {
 
similarity index 91%
rename from src/org/cacert/gigi/pages/ManagedFormPage.java
rename to src/club/wpia/gigi/pages/ManagedFormPage.java
index eabc9027a5db27ddd899b9e4969c7014056eff0b..b1cd6977400ea0e1f87ccc2ddc8e2142a5bcdbca 100644 (file)
@@ -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 {
 
similarity index 86%
rename from src/org/cacert/gigi/pages/ManagedMultiFormPage.java
rename to src/club/wpia/gigi/pages/ManagedMultiFormPage.java
index 938a7f75d70a7ebb9292087713a60b6a9a2b1900..eca378fe11bed17c0b6de482e844d75c042a7f80 100644 (file)
@@ -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 {
 
similarity index 91%
rename from src/org/cacert/gigi/pages/OneFormPage.java
rename to src/club/wpia/gigi/pages/OneFormPage.java
index 512dad49367aeb126453531ad791f57b350c38df..a36c9eb63c2bd7f9d8ed406936d0b24d99938e56 100644 (file)
@@ -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 {
 
similarity index 95%
rename from src/org/cacert/gigi/pages/Page.java
rename to src/club/wpia/gigi/pages/Page.java
index 054a1e52020bf1172a095ea26a82ce5c3b4595dd..97cd83f7bf0d68ec2ef579bee5742be80c64a022 100644 (file)
@@ -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
similarity index 89%
rename from src/org/cacert/gigi/pages/PasswordResetPage.java
rename to src/club/wpia/gigi/pages/PasswordResetPage.java
index 20b372d885e8133f11ada19bafc1b88fc0930149..7dc950cacd72fe49eafdf36ac3021a8907052402 100644 (file)
@@ -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 {
 
similarity index 97%
rename from src/org/cacert/gigi/pages/PolicyIndex.java
rename to src/club/wpia/gigi/pages/PolicyIndex.java
index 30c58856344571c88357d6dbc9659d6c3d434ab1..9db02dfab9cca64a23932fa81b64258b81a29917 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.pages;
+package club.wpia.gigi.pages;
 
 import java.io.File;
 import java.io.IOException;
similarity index 96%
rename from src/org/cacert/gigi/pages/RootCertPage.java
rename to src/club/wpia/gigi/pages/RootCertPage.java
index d714af91b759aa3305af4b92ea9d06237fd03183..c821e7c426aa6c13e757b824a229c232980282a9 100644 (file)
@@ -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 {
 
similarity index 90%
rename from src/org/cacert/gigi/pages/StaticPage.java
rename to src/club/wpia/gigi/pages/StaticPage.java
index be2e75bd937fa0f173d119489a6346825e268a1d..b07004afe6b6fb5c8561fb5436a484028f65f6d9 100644 (file)
@@ -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 {
 
similarity index 95%
rename from src/org/cacert/gigi/pages/TestSecure.java
rename to src/club/wpia/gigi/pages/TestSecure.java
index 7a3b76e3af649c2409e9176a05f2af3b1e93ebda..22790fe035c5d57cac57b04d891f4d0f34fbe566 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.pages;
+package club.wpia.gigi.pages;
 
 import java.io.IOException;
 
similarity index 91%
rename from src/org/cacert/gigi/pages/Verify.java
rename to src/club/wpia/gigi/pages/Verify.java
index bc4639810cd591dcc5cf7a53e4117d3cb12f3fed..930b5efbe4b8155d56defbf9f9ea1dd9fd3ab2a0 100644 (file)
@@ -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 {
 
similarity index 81%
rename from src/org/cacert/gigi/pages/account/ChangeForm.java
rename to src/club/wpia/gigi/pages/account/ChangeForm.java
index 086c8a85c503aa350917eb5780f6780d484cee57..53c04de600f321c83e968157c4a29fe11cf731ea 100644 (file)
@@ -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 {
 
similarity index 80%
rename from src/org/cacert/gigi/pages/account/ChangePasswordPage.java
rename to src/club/wpia/gigi/pages/account/ChangePasswordPage.java
index 60cfaa0b33ceacd7735685ebad8aca9d690fa6d1..43823002b80a2d449e013f74b001917bcfe73816 100644 (file)
@@ -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 {
 
similarity index 79%
rename from src/org/cacert/gigi/pages/account/FindAgentAccess.java
rename to src/club/wpia/gigi/pages/account/FindAgentAccess.java
index 47735f3273cf3220da81c0963441c883ec12a878..77d9aa695a755ec64c92cae386f7a999b8866b29 100644 (file)
@@ -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 {
 
similarity index 87%
rename from src/org/cacert/gigi/pages/account/History.java
rename to src/club/wpia/gigi/pages/account/History.java
index 470ed1c6cb91add8d0e6a106556af1323a156fcd..7c77cf30e7f85026d7d30b4d0e372f3c8d32ce6c 100644 (file)
@@ -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 {
 
similarity index 93%
rename from src/org/cacert/gigi/pages/account/MyDetails.java
rename to src/club/wpia/gigi/pages/account/MyDetails.java
index e6ba3ead537408fa6f1e36a0abfe480f01e4884a..12d127faf38f00bca879dbf6eda7446f7f4845b8 100644 (file)
@@ -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 {
 
similarity index 90%
rename from src/org/cacert/gigi/pages/account/MyDetailsForm.java
rename to src/club/wpia/gigi/pages/account/MyDetailsForm.java
index f5b6f514fc6c3c9eca77816f5ab00a8b1d1eeefe..4af7c94aa01ba7ee13d4088d9f6d89a202cdeb4c 100644 (file)
@@ -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 {
 
similarity index 85%
rename from src/org/cacert/gigi/pages/account/MyOrganisationsForm.java
rename to src/club/wpia/gigi/pages/account/MyOrganisationsForm.java
index aaa84173e09cf8a78c283fb60199c0d521ae93ac..835973a12b385b300808daa05d8c6ee31a41cb8f 100644 (file)
@@ -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 {
 
similarity index 87%
rename from src/org/cacert/gigi/pages/account/UserTrainings.java
rename to src/club/wpia/gigi/pages/account/UserTrainings.java
index fca2d24f2cf306d0d03379a781f212843a37d7cb..1a04e85ef8dcc80755f35770e41dcb02b9ba6208 100644 (file)
@@ -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 {
 
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 b61ec3ec62eaca1fc070a8513c2a5c509de3b7b2..9694531cfc729d0088e3d7c8dfc45fde4e6eef28 100644 (file)
@@ -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 {
 
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 3e2d8052f52a92b63b99725e45d370613ae5f413..cfeeaddd52a60cbbede420189bba923be09e5bd2 100644 (file)
@@ -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
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 7c3f7840689ea24c9c2c9136896a9a6d19b1d287..567f4cb3fa1818c43c8df2c0501a825996cc32ec 100644 (file)
@@ -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 {
 
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 5edf362e4877ef2c505ca5c6636e60b91b9b0b42..2755b18f974870902e1bdde2b8286c03db883d12 100644 (file)
@@ -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;
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 23cd915da26b0a7b4dd5daf297af9afbbd526688..e2244e99b5a823a75c43a3a12bf8668810371264 100644 (file)
@@ -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 {
 
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 372b5568e5f5bad691d0116f4a51de88baf25a29..034d957764bc0e208d0fe6437ab291712f4e7721 100644 (file)
@@ -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 {
 
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 584821796f6496b6e657d4a33a573421ba9e7aba..afcbba609909943f4db999f0d24f6f88dc2a5d59 100644 (file)
@@ -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 {
 
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 c6ea009f1d3dc669c8edfcfc8ed3fca1e9060bca..95fce624c6bdd48c27a85fa134137308b5106978 100644 (file)
@@ -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 {
 
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 aa2043a1fbd0765f867b12229279213577f86f8b..4db4865c882db62425708eaf70d1873152bf701c 100644 (file)
@@ -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 {
 
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 54209b20f34784894ee4b09e539d8daaa9b94e40..3ddde80ad2b96f7ac03493839a57b9583e589351 100644 (file)
@@ -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 {
 
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 f7df49034fa5902975553a89c5ec414d24010645..0f63676b45c0b5861c7b7783f87d531a8f943bea 100644 (file)
@@ -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 {
 
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 e212bb00e629af911bd8445d46e0dc76012b1de1..95076a0df21664cb2a2307284603692063d0e144 100644 (file)
@@ -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 {
 
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 47cd8384e831ba7899a9b8b82a553f96afc1b1fe..3c2084092185ea37918e1c8efcc48f93ac225f69 100644 (file)
@@ -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 {
 
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 5d0ce7ec7e8f06c5d09466a859ffc94d7b321635..d23260a2ac8410ed80cfaa0069ea71108828c751 100644 (file)
@@ -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 {
 
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 ef98a091238c35bc1e76ae7e0687cbfcce2c65bf..28df649c4e23bd31fd897afe73e57b2543ab31ae 100644 (file)
@@ -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 {
 
similarity index 77%
rename from src/org/cacert/gigi/pages/admin/TTPAdminForm.java
rename to src/club/wpia/gigi/pages/admin/TTPAdminForm.java
index 2f3ee8429c830cbcef2b2a7fe4f7d3ecc58e1b80..01b7f348027af318c3ce05fdbdd928b806431c72 100644 (file)
@@ -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 {
 
similarity index 87%
rename from src/org/cacert/gigi/pages/admin/TTPAdminPage.java
rename to src/club/wpia/gigi/pages/admin/TTPAdminPage.java
index 286a08d5639b377fb650d301c27153985a1a9d93..d3c1c5906428bac49ab0493f0c6eec3010530aed 100644 (file)
@@ -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 {
 
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 207a2a8a6242c1e3ff1f85e30e5a1b0c89ffbaa5..1c3d0ce75bd267b8df7735ab6034a1b7190f762d 100644 (file)
@@ -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 {
 
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 e7f6b95e4a4a9558a45f0328f51a7de4394973c6..0d2edbc9bb9032feeb6701a2c3b304621d43d463 100644 (file)
@@ -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 {
 
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 9aae447036155ec8e4dd4e986b49f0db239591fe..75c8c590166e1afe36485d2421d34b29c8f76225 100644 (file)
@@ -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 {
 
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 8a64218087c871c49de63299faffa9dab5c7d1c5..380ca2841336a819f0fdd8173701c18c9318eb88 100644 (file)
@@ -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 {
 
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 2978c48e213ce6435775713ea2c4bfad1ed7f0b4..c1cc44ced0204873a00c51574a90cd91ce6f911e 100644 (file)
@@ -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 {
 
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 9d731712cb9df146018f48ba14c293ba0b8d23a3..bf6692673fae6e7aaf6c5d45ea747b649709f73f 100644 (file)
@@ -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 {
 
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 e2e30a93d153169fced9f5858167be37e48b0510..0a98dfd124a58c2791fa75b303b7074b85ded05f 100644 (file)
@@ -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 {
 
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 01cc695fbe7a79edb8da2a0d91cbd0d6d8ff01a9..24f093a42f1c090991abaf333b14873bca2ee2c1 100644 (file)
@@ -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 {
 
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 5b163cc46af10ab6f82a158102b01b605e0003c0..f3d725c110bb59c23ae03c1dc7ea831579bb98db 100644 (file)
@@ -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 {
 
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 88b9b03b583a8081ef360f087f3a4ce646dbad05..7439ae67a5a36b76da9ad6e76899e6948f03cddc 100644 (file)
@@ -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 {
 
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 eea69f6dbfcbb9ebe0961157b4b8c78bf920356d..6831b8b3ac484a4b0cef34146a2d9a53863bf9c0 100644 (file)
@@ -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 {
 
similarity index 88%
rename from src/org/cacert/gigi/pages/error/AccessDenied.java
rename to src/club/wpia/gigi/pages/error/AccessDenied.java
index 4908c75a970f415d4b370881dffdafe9a1d76d93..5cf9d865430d9261357a56f610f7d648566aaea5 100644 (file)
@@ -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 {
 
similarity index 93%
rename from src/org/cacert/gigi/pages/error/PageNotFound.java
rename to src/club/wpia/gigi/pages/error/PageNotFound.java
index ffc107f598e67ed7bca65bb7fb26e67219a2e581..6031a73658a25944f2a671ec51c3f258467d2a67 100644 (file)
@@ -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 {
 
similarity index 88%
rename from src/org/cacert/gigi/pages/main/RegisterPage.java
rename to src/club/wpia/gigi/pages/main/RegisterPage.java
index 69dc4c1085062d042484c4e60f4730496b5c13ef..74f91074a8d6e986c6acae81df797f0691a33180 100644 (file)
@@ -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 {
 
similarity index 87%
rename from src/org/cacert/gigi/pages/main/Signup.java
rename to src/club/wpia/gigi/pages/main/Signup.java
index 011b63843d43aaee07d8c405f268236a5ad516ba..134df159bc13d9db8b479b89dadea7cba17c8a4b 100644 (file)
@@ -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"), "<a href=\"//wiki.cacert.org/FAQ/HowToEnterNamesInJoinForm\" target=\"_blank\">", "</a>"));
+        vars.put("helpOnNames", String.format(l.getTranslation("Help on Names %sin the wiki%s"), "<a href=\"#\" target=\"_blank\">", "</a>"));
         vars.put("csrf", getCSRFToken());
         vars.put("dobmin", User.MINIMUM_AGE + "");
         vars.put("countryCode", cs);
similarity index 83%
rename from src/org/cacert/gigi/pages/orga/AffiliationForm.java
rename to src/club/wpia/gigi/pages/orga/AffiliationForm.java
index 42682fedcf949371ac1e83e5b7ca5bdae05eadc4..5ac524042c78c17c7be30131b1f719fcd11c5f00 100644 (file)
@@ -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 {
 
similarity index 90%
rename from src/org/cacert/gigi/pages/orga/CreateOrgForm.java
rename to src/club/wpia/gigi/pages/orga/CreateOrgForm.java
index 7b69822549d16860cd37da089a967933b0d28f07..3aeb727bbff8d42cdce7955611501e1c80b7106e 100644 (file)
@@ -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 {
 
similarity index 81%
rename from src/org/cacert/gigi/pages/orga/CreateOrgPage.java
rename to src/club/wpia/gigi/pages/orga/CreateOrgPage.java
index 17d2a318a519296adc73766ed5e4ab05f3e9d224..8c45fef5fb936042aeedfc0573a9a9d4a5c1e769 100644 (file)
@@ -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 {
 
similarity index 71%
rename from src/org/cacert/gigi/pages/orga/OrgDomainAddForm.java
rename to src/club/wpia/gigi/pages/orga/OrgDomainAddForm.java
index 78e04b405b46f94461af02717e9382f46f0f578f..a593a6734b92dc705bc690f3a7cb1be0b2c51f42 100644 (file)
@@ -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 {
 
similarity index 87%
rename from src/org/cacert/gigi/pages/orga/ViewOrgPage.java
rename to src/club/wpia/gigi/pages/orga/ViewOrgPage.java
index 0924a8981aa6e74d1325435a7acd339259649ed5..ec4fb365a634c56c06ae9afd7f4bcdd265036ba4 100644 (file)
@@ -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 {
 
similarity index 85%
rename from src/org/cacert/gigi/pages/statistics/StatisticsRoles.java
rename to src/club/wpia/gigi/pages/statistics/StatisticsRoles.java
index c1b10e2f354ee8ed0cedd9dcc0c48f73d8e08d0d..648c7ee6a95466f3e673d047d2120b5a29421cfe 100644 (file)
@@ -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 {
 
similarity index 90%
rename from src/org/cacert/gigi/pages/wot/AssuranceForm.java
rename to src/club/wpia/gigi/pages/wot/AssuranceForm.java
index b46dfdd530637785a4fcb10b974f8b0459a34061..f4bda1ee50eaf39af11c66cfbbeab3cc88661947 100644 (file)
@@ -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 {
 
similarity index 87%
rename from src/org/cacert/gigi/pages/wot/AssurePage.java
rename to src/club/wpia/gigi/pages/wot/AssurePage.java
index 8ce8f72b4dd7c1f1ab5262c113785a7ad9fc4847..cc0c5a07e912bfde7f1d2a12ee3bec4ac0f8842f 100644 (file)
@@ -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!"));
similarity index 91%
rename from src/org/cacert/gigi/pages/wot/Points.java
rename to src/club/wpia/gigi/pages/wot/Points.java
index 453873524ed991af46464254eb094a2a00458d4a..039d39d971f8d110fb7d18f49fc2ca589b0c26ca 100644 (file)
@@ -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 {
 
similarity index 77%
rename from src/org/cacert/gigi/pages/wot/RequestTTPForm.java
rename to src/club/wpia/gigi/pages/wot/RequestTTPForm.java
index 7348346fc30a35fc4831803d01a15e20f2e9867a..8045d82d28c20fa254801af53b24a957a1d483e7 100644 (file)
@@ -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 {
 
similarity index 87%
rename from src/org/cacert/gigi/pages/wot/RequestTTPPage.java
rename to src/club/wpia/gigi/pages/wot/RequestTTPPage.java
index f4b739c462cadf6b6ef27caa042c62a1d6997409..a83de6c54dd571f7f71c1ab27c3af17c7003e525 100644 (file)
@@ -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 {
 
similarity index 89%
rename from src/org/cacert/gigi/ping/DNSPinger.java
rename to src/club/wpia/gigi/ping/DNSPinger.java
index f9a4e7103ad0248cd33c4ed712ae7a15ca5e0962..aeb41e5f7418db1608676199e7383f0975201f35 100644 (file)
@@ -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 {
 
similarity index 89%
rename from src/org/cacert/gigi/ping/DomainPinger.java
rename to src/club/wpia/gigi/ping/DomainPinger.java
index c5eb3926bea8d8a2fed6b0b766b11171d9a13ae0..fcb8f12e93263170a6af2da39e556ad91882c926 100644 (file)
@@ -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 {
 
similarity index 75%
rename from src/org/cacert/gigi/ping/EmailPinger.java
rename to src/club/wpia/gigi/ping/EmailPinger.java
index dfb2b74a54017fc1fb70190ec8f56e750189067b..454ba81d30929a18c7f06cc852836cd77ff43052 100644 (file)
@@ -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 {
 
similarity index 90%
rename from src/org/cacert/gigi/ping/HTTPFetch.java
rename to src/club/wpia/gigi/ping/HTTPFetch.java
index 1f31ccd633d19f0e00b91140852448b4e024230e..7ad08b55b0bd6ddcfe9ec2793be9e497ce624853 100644 (file)
@@ -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 {
 
similarity index 90%
rename from src/org/cacert/gigi/ping/PingerDaemon.java
rename to src/club/wpia/gigi/ping/PingerDaemon.java
index d499679ce08122ecd8bd36eed499787dbc977101..1cd48cf17f6158a42428c4f80c0d47973a91b88f 100644 (file)
@@ -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 {
 
similarity index 98%
rename from src/org/cacert/gigi/ping/SSLPinger.java
rename to src/club/wpia/gigi/ping/SSLPinger.java
index 7db5a6b16786a066cb4f3427990a2477b111c7ed..db0f0f52e45b04e3573add98d1b9680b1449df71 100644 (file)
@@ -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;
 
similarity index 87%
rename from src/org/cacert/gigi/util/AuthorizationContext.java
rename to src/club/wpia/gigi/util/AuthorizationContext.java
index 892f1175d00d376d5dde56bf3ad25295281b644d..fdc9187b8e80267267bc9b52f912b402d8e08271 100644 (file)
@@ -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 {
 
similarity index 94%
rename from src/org/cacert/gigi/util/CAA.java
rename to src/club/wpia/gigi/util/CAA.java
index 58350539cf41166c78af8f110320aab2d5590548..7100b55708918777bd33f4fb83826ce467878ccd 100644 (file)
@@ -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 {
 
similarity index 97%
rename from src/org/cacert/gigi/util/CalendarUtil.java
rename to src/club/wpia/gigi/util/CalendarUtil.java
index 7d65407779d48f3211f9819d0f2a18e09def1668..6ff7bb291d8a6f2d5a6a5f5262a8dfb4cbb1e265 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.util.Calendar;
 import java.util.Date;
similarity index 98%
rename from src/org/cacert/gigi/util/CertExporter.java
rename to src/club/wpia/gigi/util/CertExporter.java
index c227f09c4c1f041f0d7c8a57197c44db232427c0..cfe97ef2c847430711289e752837ddc41ca5f720 100644 (file)
@@ -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;
similarity index 99%
rename from src/org/cacert/gigi/util/CipherInfo.java
rename to src/club/wpia/gigi/util/CipherInfo.java
index 7e5ecc17be58e676c66e37f81c5ec2b43fa1e176..9fda8ca4b8b9594dd9c30a0b50b24e161d08dc9d 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
similarity index 97%
rename from src/org/cacert/gigi/util/DNSUtil.java
rename to src/club/wpia/gigi/util/DNSUtil.java
index d0c772aff40861bacfced40503d55f21d58f0531..5bec99693d2c00fe8da3cc24b29ad985c47f3391 100644 (file)
@@ -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 {
 
similarity index 98%
rename from src/org/cacert/gigi/util/DayDate.java
rename to src/club/wpia/gigi/util/DayDate.java
index a38e318c98f183cd85e9399c0ee6ee5fe24b53f7..8ade34270b444839aa9549f72e746ce17d54460d 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.sql.Date;
 
similarity index 98%
rename from src/org/cacert/gigi/util/DomainAssessment.java
rename to src/club/wpia/gigi/util/DomainAssessment.java
index f48012f8bc43223915c3341a2b4aa2e309f25b18..d24404ed4676752aa9aab075c2186c43a2c9f400 100644 (file)
@@ -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 {
 
similarity index 98%
rename from src/org/cacert/gigi/util/EditDistance.java
rename to src/club/wpia/gigi/util/EditDistance.java
index 0cadd213166919bcbced6bbf4f3f72d6f7f291df..d1d230cd41c053d6f0df9f6318a9946908003a02 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 public class EditDistance {
 
similarity index 90%
rename from src/org/cacert/gigi/util/HTMLEncoder.java
rename to src/club/wpia/gigi/util/HTMLEncoder.java
index ed943cbe103f435d631f109546ca955817cf0583..3d50f14a1dbaa08052a3b71bf185c43b0e404650 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 public class HTMLEncoder {
 
similarity index 96%
rename from src/org/cacert/gigi/util/KeyStorage.java
rename to src/club/wpia/gigi/util/KeyStorage.java
index 7ce0d2853995c8983248093c11982c161de444dc..b87df9a77a29441049ae25337afc157e395fb9bb 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.io.File;
 
similarity index 95%
rename from src/org/cacert/gigi/util/Notary.java
rename to src/club/wpia/gigi/util/Notary.java
index 33bf674e5317ababfa9acc7a9fc9627d8d11e05a..3df11763c1b72d1fcbfacbf3241d91baacf3c4ca 100644 (file)
@@ -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 {
 
similarity index 96%
rename from src/org/cacert/gigi/util/PEM.java
rename to src/club/wpia/gigi/util/PEM.java
index 3be46531dc93bf9d26740399c6e3aa311a47a2ce..211ebc60da42cd48ccd765bce9070e58b1c73d2f 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.util.Base64;
 import java.util.regex.Pattern;
similarity index 99%
rename from src/org/cacert/gigi/util/PasswordHash.java
rename to src/club/wpia/gigi/util/PasswordHash.java
index 97e3493aa63a76333fe1fa6098fab4a6e92e6254..51dffb70d8ed0763548ce7be6fed104364682c30 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
similarity index 94%
rename from src/org/cacert/gigi/util/PasswordStrengthChecker.java
rename to src/club/wpia/gigi/util/PasswordStrengthChecker.java
index c957665ec667d2da917331b4150c6d23224d3a0b..21aa533ff5648a27c789688ea131c71fecf5e4da 100644 (file)
@@ -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 {
 
similarity index 99%
rename from src/org/cacert/gigi/util/PublicSuffixes.java
rename to src/club/wpia/gigi/util/PublicSuffixes.java
index 19c7b1dc952d15bf6255f98209c0ce7ebe1e1a5d..401502f72f03df0d8aaf54d4bfd31cdb8ef47a93 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
similarity index 95%
rename from src/org/cacert/gigi/util/RandomToken.java
rename to src/club/wpia/gigi/util/RandomToken.java
index 8a11c8f096abcb6868dd15f517382d4636f1a589..90bbd1e61e0fcea9568805ee2d9cab9cb806b931 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.security.SecureRandom;
 
similarity index 96%
rename from src/org/cacert/gigi/util/RateLimit.java
rename to src/club/wpia/gigi/util/RateLimit.java
index d7873a03830cd20877c4e76cf3bba4024bb1bc02..795d5a63fa5ce30d6c9ae6cfb132e4c7db82ede7 100644 (file)
@@ -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 {
 
similarity index 91%
rename from src/org/cacert/gigi/util/ServerConstants.java
rename to src/club/wpia/gigi/util/ServerConstants.java
index 73bf9d2ec24ca8a108750052f4f56697f12eb025..d3901e8d898563cd45afa6a87c1f5dd7238859d1 100644 (file)
@@ -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 = "";
similarity index 92%
rename from src/org/cacert/gigi/util/SystemKeywords.java
rename to src/club/wpia/gigi/util/SystemKeywords.java
index 8060e8901a4667aad49a7022adeb03d04cebaf60..847df894a57848471b1bf185187e50f283843bde 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 public class SystemKeywords {
 
similarity index 97%
rename from src/org/cacert/gigi/util/TimeConditions.java
rename to src/club/wpia/gigi/util/TimeConditions.java
index b851dc9d83e6d99bf634083599fc1ce805d948b3..3396881450f7b2fcfaa1eabfa2502d8e17bc213b 100644 (file)
@@ -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 {
 
similarity index 87%
rename from tests/org/cacert/gigi/DomainVerification.java
rename to tests/club/wpia/gigi/DomainVerification.java
index cc2d01ab4146e5ac2364fd22e49efabdb311618b..870963971698f11066f84d5baa50e9f3d2d4e745 100644 (file)
@@ -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);
similarity index 93%
rename from tests/org/cacert/gigi/LoginTest.java
rename to tests/club/wpia/gigi/LoginTest.java
index ed1c932af6e9c4676e64c74c6c50debe42bacd9e..ab2780c4d9c3546e5b0223695b2fb190850b6d90 100644 (file)
@@ -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
similarity index 95%
rename from tests/org/cacert/gigi/TestCalendarUtil.java
rename to tests/club/wpia/gigi/TestCalendarUtil.java
index 47ce3b99d5c8570997e09c69ce34bacd965c9f87..5bed6e56305561ba7c18ed7502771c9fa64f7ccd 100644 (file)
@@ -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
similarity index 91%
rename from tests/org/cacert/gigi/TestCertificate.java
rename to tests/club/wpia/gigi/TestCertificate.java
index 0305d50968537b038e1079a75c2d9c6645c813b3..d791bfd0ee84654ac3a88769530b7befd203ba29 100644 (file)
@@ -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 {
similarity index 91%
rename from tests/org/cacert/gigi/TestCrossDomainAccess.java
rename to tests/club/wpia/gigi/TestCrossDomainAccess.java
index ee3584fd41f7cbd6281e9e00e22498fea7d4485d..fbcc3009b2473de30ee6570e7ced38d8d502ed30 100644 (file)
@@ -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
similarity index 95%
rename from tests/org/cacert/gigi/TestDomain.java
rename to tests/club/wpia/gigi/TestDomain.java
index 285fca9a27df6fcda3cd37a5496473004d122b5b..ccdf11396c23da081c9b7b3a75ec68719785dc39 100644 (file)
@@ -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
similarity index 93%
rename from tests/org/cacert/gigi/TestLanguage.java
rename to tests/club/wpia/gigi/TestLanguage.java
index 912cab6ff9abd6df3674741ad1c6990a1fa5e32c..2cc4563c791c288f39d4709715c30e96c5f81382 100644 (file)
@@ -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
similarity index 96%
rename from tests/org/cacert/gigi/TestName.java
rename to tests/club/wpia/gigi/TestName.java
index ba901a8a2a01cb23aa4cdee5f1fed5c4fd108c94..51234f8386dca04b2fade2bed2299af5883e359c 100644 (file)
@@ -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
similarity index 87%
rename from tests/org/cacert/gigi/TestObjectCache.java
rename to tests/club/wpia/gigi/TestObjectCache.java
index 1d35669b8dc68421cf18eb02324250ee9a0e65ff..fda39d26509dd4f5fa5b1bd6e294c70f764451c9 100644 (file)
@@ -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
similarity index 86%
rename from tests/org/cacert/gigi/TestOrga.java
rename to tests/club/wpia/gigi/TestOrga.java
index ff3a56cc82fd3bc998101d1fd400fe78edde5b2e..8a7f7a52b1cf8c5aab48971bc36336232e046ebe 100644 (file)
@@ -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
similarity index 93%
rename from tests/org/cacert/gigi/TestPasswordReset.java
rename to tests/club/wpia/gigi/TestPasswordReset.java
index 18402106e8382261b3634d8a126e220331f31110..7da85e196c8c3e7bfe8c7d116ff5b3e8915dcfe3 100644 (file)
@@ -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);
similarity index 84%
rename from tests/org/cacert/gigi/TestSQL.java
rename to tests/club/wpia/gigi/TestSQL.java
index f7f6df7a768423f86a5fff13337b7681b8ad9923..2addd7e2dc7b125854593325ddb1b02117ced730 100644 (file)
@@ -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
similarity index 96%
rename from tests/org/cacert/gigi/TestSSL.java
rename to tests/club/wpia/gigi/TestSSL.java
index 74806eef8bd74170e5bbdbce74230e2fe03fe3d1..24e6cc8856f583c567631c0261203b9f4a021a81 100644 (file)
@@ -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;
similarity index 90%
rename from tests/org/cacert/gigi/TestSecurityHeaders.java
rename to tests/club/wpia/gigi/TestSecurityHeaders.java
index 8149d322a22f21d917aeb91749630e701cc072e8..d99b1703c8198e88dbecbe85f9ef713eb6be67d3 100644 (file)
@@ -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
similarity index 91%
rename from tests/org/cacert/gigi/TestSeparateSessionScope.java
rename to tests/club/wpia/gigi/TestSeparateSessionScope.java
index 9ace036ea78e02f03a62cf77d1ba9577169c9dd4..c5bb9dceabd40fd8aaa590f42829e44ad30be9cc 100644 (file)
@@ -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
similarity index 90%
rename from tests/org/cacert/gigi/TestUser.java
rename to tests/club/wpia/gigi/TestUser.java
index 4c22f8138280b8dea10a1fb2574e4a283e1b8467..8f5dbd33ca31297f2db18ae5212ad8ccc9e6209e 100644 (file)
@@ -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
similarity index 93%
rename from tests/org/cacert/gigi/TestUserGroupMembership.java
rename to tests/club/wpia/gigi/TestUserGroupMembership.java
index 5ddf2d11026a22d41c70849cf0d51058f176eba6..d0e7a2bf0dafdf2d4762a9b8cf8696a0fab3bab7 100644 (file)
@@ -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;
similarity index 92%
rename from tests/org/cacert/gigi/TestUserSerialize.java
rename to tests/club/wpia/gigi/TestUserSerialize.java
index 91c1dfd437ab5eff0f27a731df0783ff356ee975..70a8b6fed830d7afe9ef4475d21ff7c33379d6d0 100644 (file)
@@ -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 {
similarity index 87%
rename from tests/org/cacert/gigi/api/ImportCATSResult.java
rename to tests/club/wpia/gigi/api/ImportCATSResult.java
index a0caee2b66f2e75e1fa65cd28d4e78174d970023..1d392500ee756f759ef2d0261f47248d998bd91b 100644 (file)
@@ -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);
 
similarity index 88%
rename from tests/org/cacert/gigi/api/IssueCert.java
rename to tests/club/wpia/gigi/api/IssueCert.java
index 60dc286d962f6996e5a1946cde85a7a8f7230345..d5302f9263f429d0e4e064d7687fbf9adae4771c 100644 (file)
@@ -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 {
similarity index 86%
rename from tests/org/cacert/gigi/api/TestFindAgent.java
rename to tests/club/wpia/gigi/api/TestFindAgent.java
index 71bad946b6ad9306b471cd09bbd6e55571ee7a95..cae8b812a6aa4f6ad9d2c4e438d2617c0629d060 100644 (file)
@@ -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());
similarity index 96%
rename from tests/org/cacert/gigi/crypto/TestSPKAC.java
rename to tests/club/wpia/gigi/crypto/TestSPKAC.java
index 3dd39a2d5f13c62c9fee09bf93df23aa1b9e8fb9..7f72242b901a18d05b20f3d540629e79b93c450c 100644 (file)
@@ -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 {
similarity index 96%
rename from tests/org/cacert/gigi/dbObjects/TestAssurance.java
rename to tests/club/wpia/gigi/dbObjects/TestAssurance.java
index 71c996d53275be8fd54991f5e549d0c8558f409b..3906e601f597e6517c545a280d61e1e6dc7d85e7 100644 (file)
@@ -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);
similarity index 96%
rename from tests/org/cacert/gigi/dbObjects/TestAssuranceMail.java
rename to tests/club/wpia/gigi/dbObjects/TestAssuranceMail.java
index 57fc997bb1e89b2beb0baced0876ee29c4a7b342..5efc69e88d319420a448ce57d4d86c71ca37a180 100644 (file)
@@ -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;
similarity index 76%
rename from tests/org/cacert/gigi/dbObjects/TestAssureName.java
rename to tests/club/wpia/gigi/dbObjects/TestAssureName.java
index c84bf4833e796f7b24429ff1d841ac882278f42c..4d90250986347851d85f6fbb07057aded74cef7f 100644 (file)
@@ -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
similarity index 90%
rename from tests/org/cacert/gigi/dbObjects/TestCATS.java
rename to tests/club/wpia/gigi/dbObjects/TestCATS.java
index 50f1cbe4e39881829b705d5a9260681f7050cc6c..87513e14b01114810eaf577dcfc2fb95a277a810 100644 (file)
@@ -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 {
 
     /**
similarity index 78%
rename from tests/org/cacert/gigi/dbObjects/TestCertificate.java
rename to tests/club/wpia/gigi/dbObjects/TestCertificate.java
index 3b4a63b4b9d7497de7fa273ac4bff80ad88b9f05..519bd59e8acc98ac196f429bb97584295b910976 100644 (file)
@@ -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
similarity index 92%
rename from tests/org/cacert/gigi/dbObjects/TestCountryCode.java
rename to tests/club/wpia/gigi/dbObjects/TestCountryCode.java
index 7f82909c75cc1dc5763f8b210271c760029c2332..1a9b1adf24d3033053193c4a94dd41a2fc682221 100644 (file)
@@ -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 {
 
similarity index 93%
rename from tests/org/cacert/gigi/email/TestEmailProviderClass.java
rename to tests/club/wpia/gigi/email/TestEmailProviderClass.java
index 1ebb8117dd0b9775f5407bc95ffc52e56b79b790..a61be922d7e59ba26916a1b6cda8c3349fe2a221 100644 (file)
@@ -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[] {
similarity index 93%
rename from tests/org/cacert/gigi/email/TestSendmail.java
rename to tests/club/wpia/gigi/email/TestSendmail.java
index d9af0a28f62e6fceaaefb998afc3466243cc6c5c..9f3358b95e077d411cd6fea845606ceed121efeb 100644 (file)
@@ -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"));
similarity index 90%
rename from tests/org/cacert/gigi/pages/TestVerify.java
rename to tests/club/wpia/gigi/pages/TestVerify.java
index 28572eb355a3c1cad5ab20db010c067fe109c436..d1b799b5688d3d03c118a3952ce57b977144bdb7 100644 (file)
@@ -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
similarity index 97%
rename from tests/org/cacert/gigi/pages/account/TestCertificateAdd.java
rename to tests/club/wpia/gigi/pages/account/TestCertificateAdd.java
index 2fc2f60e5c20d9a74da873b9b3ea5bbc7fa8175d..9b3a7638cd9125dbf6acea1fe6df0dbd69a01488 100644 (file)
@@ -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;
similarity index 90%
rename from tests/org/cacert/gigi/pages/account/TestCertificateRequest.java
rename to tests/club/wpia/gigi/pages/account/TestCertificateRequest.java
index 0beaef87998a8b24e1e4a7387bd9534329390094..52938183d0f7acea4165c17d99a21892dc07542f 100644 (file)
@@ -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();
similarity index 95%
rename from tests/org/cacert/gigi/pages/account/TestChangePassword.java
rename to tests/club/wpia/gigi/pages/account/TestChangePassword.java
index 9601842631a1b639e730233458d43e6c87b7993a..7a2a6a923f7187f0d7e5bc018f55216713529b4d 100644 (file)
@@ -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;
similarity index 89%
rename from tests/org/cacert/gigi/pages/account/TestDomain.java
rename to tests/club/wpia/gigi/pages/account/TestDomain.java
index 49f1b85cb03940b8be38602ed198a3b5b0413d74..d4b12ed42961faa49dd74012736e5c94d8ea8bd1 100644 (file)
@@ -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 {}
similarity index 95%
rename from tests/org/cacert/gigi/pages/account/TestMailManagement.java
rename to tests/club/wpia/gigi/pages/account/TestMailManagement.java
index fd4d4d499cc610fb341e04670653571c24df305e..84ad60de4cd5074b1939394d15242a233f8ab321 100644 (file)
@@ -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;
similarity index 93%
rename from tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
rename to tests/club/wpia/gigi/pages/account/TestMyDetailsEdit.java
index 835978489e864f8dfaa86c2dd5499ce7c0a1511a..7f2a811ff3fecc68f05177433e0508cf40afd4ed 100644 (file)
@@ -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";
similarity index 88%
rename from tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java
rename to tests/club/wpia/gigi/pages/account/TestPasswordResetExternal.java
index b00927b2a627ba19a0c252a91726a931a84b1711..872fc7467fca4b7f45ecc8f91a94f0a1f5cb665a 100644 (file)
@@ -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
similarity index 77%
rename from tests/org/cacert/gigi/pages/account/TestTrainings.java
rename to tests/club/wpia/gigi/pages/account/TestTrainings.java
index 7a30a3dccff941b7be89eba6f020ea38a5566868..1c559574a24f566ae75be5c81194cf36e62c5660 100644 (file)
@@ -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 {}
similarity index 93%
rename from tests/org/cacert/gigi/pages/admin/TestSEAdminNotificationMail.java
rename to tests/club/wpia/gigi/pages/admin/TestSEAdminNotificationMail.java
index f025b0f69e11af2966aeffa747735df997e07b5a..8a439a31628c7499ae2554be6001e812ee409b96 100644 (file)
@@ -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;
similarity index 91%
rename from tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java
rename to tests/club/wpia/gigi/pages/admin/TestSEAdminPageDetails.java
index e9b31abba12e6331f8e4f648b5ac0df8ff9ac612..5a458a2814e5ea222969ed3941d32ec221e38ed1 100644 (file)
@@ -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 {
similarity index 84%
rename from tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java
rename to tests/club/wpia/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java
index 57c5c15cdcf84c06df864ff2da9e22c17f651580..f662532ff1ac8c92499cd78d2f2dfb6d4a0dee27 100644 (file)
@@ -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;
similarity index 94%
rename from tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserMailSearch.java
rename to tests/club/wpia/gigi/pages/admin/TestSEAdminPageUserMailSearch.java
index 29918b5a0a55c5618e940a450c21c646d586a754..831deed65b145c9b6f195c965642a3fc91386629 100644 (file)
@@ -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 {
similarity index 75%
rename from tests/org/cacert/gigi/pages/admin/TestSEAdminTicketSetting.java
rename to tests/club/wpia/gigi/pages/admin/TestSEAdminTicketSetting.java
index 01e17b3c8568e2ba50415564c4d36b04a1e092c1..59f042793af7dbb0033b446cea12d03fecaa1a27 100644 (file)
@@ -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 {
similarity index 95%
rename from tests/org/cacert/gigi/pages/main/RegisterPageTest.java
rename to tests/club/wpia/gigi/pages/main/RegisterPageTest.java
index 9fb618300b5e1c04761b027b61fa1cc55682f073..aee9ad5b142299f5b36c3b02a571951d4de6e3f8 100644 (file)
@@ -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) {
 
similarity index 92%
rename from tests/org/cacert/gigi/pages/orga/TestOrgDomain.java
rename to tests/club/wpia/gigi/pages/orga/TestOrgDomain.java
index b24bb83e9caa1ea6072b323d0c7b438a76cef89d..c758b7c63701ad37c3965faf59a62383651490e7 100644 (file)
@@ -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 {
similarity index 95%
rename from tests/org/cacert/gigi/pages/orga/TestOrgManagement.java
rename to tests/club/wpia/gigi/pages/orga/TestOrgManagement.java
index 523ce88b050a7858bbd9b6b2708330c774032fa3..a6cd57540306e06f6eaf11218f2aafbe1bd8a2ef 100644 (file)
@@ -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 {
similarity index 95%
rename from tests/org/cacert/gigi/pages/wot/TestAssurance.java
rename to tests/club/wpia/gigi/pages/wot/TestAssurance.java
index 0af859ccc979ad664a0cc47a682ae9365ce25bba..20ebe100587054e7e02f74d00c6b4559ddc02ff0 100644 (file)
@@ -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);
similarity index 77%
rename from tests/org/cacert/gigi/pages/wot/TestTTP.java
rename to tests/club/wpia/gigi/pages/wot/TestTTP.java
index 560d1b5653559b183bbf34da63fc0013477937bf..c0a966fca5c91892c5f876607498544884234a85 100644 (file)
@@ -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 {}
similarity index 85%
rename from tests/org/cacert/gigi/pages/wot/TestTTPAdmin.java
rename to tests/club/wpia/gigi/pages/wot/TestTTPAdmin.java
index 12430b7c84ea36e4c3e6b06d8244230e7328c80a..2e3c386284d776c8b8b3d6a37919aa0fbd7b2778 100644 (file)
@@ -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;
similarity index 91%
rename from tests/org/cacert/gigi/ping/TestDNS.java
rename to tests/club/wpia/gigi/ping/TestDNS.java
index 96d9f438310d4854e1e9aeb6686ff2f8b4fb46b7..4285e8bd3af53ee37404b19f23ea17ade6150921 100644 (file)
@@ -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
similarity index 93%
rename from tests/org/cacert/gigi/ping/TestHTTP.java
rename to tests/club/wpia/gigi/ping/TestHTTP.java
index 748305e934264b69da1286ebd26ed1c5d8f6c9e2..8dc041f65b311916e9fa2ae41db853d84b5f0310 100644 (file)
@@ -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
similarity index 94%
rename from tests/org/cacert/gigi/ping/TestSSL.java
rename to tests/club/wpia/gigi/ping/TestSSL.java
index e0c78bd0a0edae15ddc628cd5e471515422184d9..9b93c77d93a94d28573c754a69165ea8fd66fea7 100644 (file)
@@ -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 {
 
similarity index 93%
rename from tests/org/cacert/gigi/template/TestTemplate.java
rename to tests/club/wpia/gigi/template/TestTemplate.java
index 82aad9316ee8850e6167e0ec13eab36573900cff..3da413ad044f4866fa3129f40e4ef1b0adc7b625 100644 (file)
@@ -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<String, Object> vars, String input) {
similarity index 87%
rename from tests/org/cacert/gigi/template/TestTemplateMail.java
rename to tests/club/wpia/gigi/template/TestTemplateMail.java
index fb610dc2bd2d9be56dc4bb38aaf2b72f2cc4fe19..c6607140526e562c4450c39caa68da64c6ae8e9b 100644 (file)
@@ -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";
similarity index 88%
rename from tests/org/cacert/gigi/template/TestTemplateUnescaped.java
rename to tests/club/wpia/gigi/template/TestTemplateUnescaped.java
index 8c8a5683d2fbe010a884f8c671797a51440dcb22..4c8ae414f0fdfa4d6a855e8800c43d8af9da50ce 100644 (file)
@@ -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<String, Object> vars, String input) {
similarity index 90%
rename from tests/org/cacert/gigi/testUtils/BusinessTest.java
rename to tests/club/wpia/gigi/testUtils/BusinessTest.java
index ad0b1e1f2a4e2d88d598e30e67457859dc094978..d62713a6026c6e2e333344fd05a28b1b2f3f60f6 100644 (file)
@@ -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 {
similarity index 74%
rename from tests/org/cacert/gigi/testUtils/ClientBusinessTest.java
rename to tests/club/wpia/gigi/testUtils/ClientBusinessTest.java
index 31c28686694aefbb722d3cbc787ad6dc29988287..023d55ed4b3ab43da9567346d26d03db72502409 100644 (file)
@@ -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 {
 
similarity index 94%
rename from tests/org/cacert/gigi/testUtils/ClientTest.java
rename to tests/club/wpia/gigi/testUtils/ClientTest.java
index 923fd97a70486ecdd14348a1aaefffd2a33e6330..1cd12d2656ab7cc4e3386bf4418b2c29814ed774 100644 (file)
@@ -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,
similarity index 90%
rename from tests/org/cacert/gigi/testUtils/ConfiguredTest.java
rename to tests/club/wpia/gigi/testUtils/ConfiguredTest.java
index c3d67b9a5e73de1f0f07da3fb3e7378db1d16517..bf50d6112af53ce1565eadf1b0c8cc7dd3266f0e 100644 (file)
@@ -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;
similarity index 98%
rename from tests/org/cacert/gigi/testUtils/IOUtils.java
rename to tests/club/wpia/gigi/testUtils/IOUtils.java
index 61cd17840c88c659f225c5ee08b54af5a2dd4243..f35c1a47da96b5954099a49e8b029195c3a09914 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.testUtils;
+package club.wpia.gigi.testUtils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.CharArrayWriter;
similarity index 88%
rename from tests/org/cacert/gigi/testUtils/InitTruststore.java
rename to tests/club/wpia/gigi/testUtils/InitTruststore.java
index 1207df930b3cd6b70e0d353f40dab0d45807ca9e..b91b3ffe8b75c37261102f09bbe3a482fd6bb770 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.testUtils;
+package club.wpia.gigi.testUtils;
 
 public class InitTruststore {
 
similarity index 70%
rename from tests/org/cacert/gigi/testUtils/MailReceiver.java
rename to tests/club/wpia/gigi/testUtils/MailReceiver.java
index 99a88864622036e7759a5dd49613fd914a1821b4..4d1bc1048864deaeb6eb1b1e202da259f7310bca 100644 (file)
@@ -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 {
 
similarity index 96%
rename from tests/org/cacert/gigi/testUtils/ManagedTest.java
rename to tests/club/wpia/gigi/testUtils/ManagedTest.java
index dda6736d6ad71a605b83897b2d5a8960c0f20400..2574922196c28d5262ba3778070ab6941dc42839 100644 (file)
@@ -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"));
similarity index 68%
rename from tests/org/cacert/gigi/testUtils/OrgTest.java
rename to tests/club/wpia/gigi/testUtils/OrgTest.java
index 5a42a4a6d8d44932d84a136da2aa8d339eb32df3..e7360fe2a5c2ae6e55652dd27ecbff1203ee9beb 100644 (file)
@@ -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 {
 
similarity index 92%
rename from tests/org/cacert/gigi/testUtils/PingTest.java
rename to tests/club/wpia/gigi/testUtils/PingTest.java
index a432cb2af61b91a2dd9b4ce1b63e2dec7765dd03..87ea982f5dc35c3095dda59062fb5f54da0fc737 100644 (file)
@@ -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.
similarity index 90%
rename from tests/org/cacert/gigi/testUtils/RegisteredUser.java
rename to tests/club/wpia/gigi/testUtils/RegisteredUser.java
index a5b517287bf072adf20f8763620ed8660de2c05a..a5d7aeb871c72517f85db5041fc3149ff1944240 100644 (file)
@@ -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;
similarity index 79%
rename from tests/org/cacert/gigi/testUtils/RestrictedApiTest.java
rename to tests/club/wpia/gigi/testUtils/RestrictedApiTest.java
index 4fbfc4f009fd05a7c7c29165479869132e00866c..a96414fa55fc2e8d2f9878489c310799378cd1cb 100644 (file)
@@ -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());
similarity index 98%
rename from tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
rename to tests/club/wpia/gigi/testUtils/TestEmailReceiver.java
index 155539c798b1ed0c0e18ba7807e26b8df7610b89..01dbe78ec7e77b17fd2ce2618106513fa5d4a214 100644 (file)
@@ -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
similarity index 96%
rename from tests/org/cacert/gigi/util/EditDistanceTest.java
rename to tests/club/wpia/gigi/util/EditDistanceTest.java
index b3331627ab8f84247274b07a12b5065e497a18ee..0d11be90f5db65ebf5f93e0412e410df20b90122 100644 (file)
@@ -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 {
 
similarity index 81%
rename from tests/org/cacert/gigi/util/TestCAAValidation.java
rename to tests/club/wpia/gigi/util/TestCAAValidation.java
index b483a68f66ea4a583afd51ddf67777372bd7bfa2..b1db8b602b88db8899ea1a9a3d39963ebef7f996 100644 (file)
@@ -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 {
 
similarity index 90%
rename from tests/org/cacert/gigi/util/TestHTMLEncoder.java
rename to tests/club/wpia/gigi/util/TestHTMLEncoder.java
index 5d3a2aed493d1731dff21a468992d44b4845729d..92eddab0641c8ad0fed114e73fad8f01eb62100c 100644 (file)
@@ -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
similarity index 91%
rename from tests/org/cacert/gigi/util/TestNotary.java
rename to tests/club/wpia/gigi/util/TestNotary.java
index 27c22d2ef00608fc2452a64399b0128b480f1a62..6733dd63f5c8bfb6752201e5f63ff4c85084abc8 100644 (file)
@@ -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);
similarity index 90%
rename from tests/org/cacert/gigi/util/TestPasswordHash.java
rename to tests/club/wpia/gigi/util/TestPasswordHash.java
index 6e38a2bd82e78ed870235b7d9a9dd7b3b8990058..b865afe4d5bf4c52a9006285b13e58c9d65e2a43 100644 (file)
@@ -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
similarity index 80%
rename from tests/org/cacert/gigi/util/TestPasswordMigration.java
rename to tests/club/wpia/gigi/util/TestPasswordMigration.java
index 7ff4ea6dd76176bdc9e577c8610e4eb4c655e557..17544a0bdc610737aa0af8be9771f3c5f2de614d 100644 (file)
@@ -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
similarity index 93%
rename from tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java
rename to tests/club/wpia/gigi/util/TestPasswordStrengthChecker.java
index 94c605915948b57651fdcb34502087432207dbfc..16e2cbbd61c8248912a081ceba88b43da20894fe 100644 (file)
@@ -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";
similarity index 97%
rename from tests/org/cacert/gigi/util/TestPublicSuffixes.java
rename to tests/club/wpia/gigi/util/TestPublicSuffixes.java
index 950224154004a111a326092bf02d9d1179a245ac..a4847eb4776d9fc34a0504a85ecc618e6f5b5da4 100644 (file)
@@ -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 {
 
similarity index 93%
rename from util-testing/org/cacert/gigi/DevelLauncher.java
rename to util-testing/club/wpia/gigi/DevelLauncher.java
index 0fe534548aeab7b22c9e6ad030692f21e7e87c92..69a47ec4e49231098341731959f90a26624aa2ba 100644 (file)
@@ -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 {
similarity index 94%
rename from util-testing/org/cacert/gigi/GenerateProfileOverview.java
rename to util-testing/club/wpia/gigi/GenerateProfileOverview.java
index 99d45e2ec3352be02f9c191afd8e4c60622614c0..f47d3c0c1189b4ded1012d2784171c9c324390ff 100644 (file)
@@ -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 {
 
similarity index 91%
rename from util-testing/org/cacert/gigi/TestLauncher.java
rename to util-testing/club/wpia/gigi/TestLauncher.java
index 89fc9e23dd06a829ff1242f118ba88e5487a575a..872eae54de2fa10fb87275102f79b4b115a0dd8d 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package club.wpia.gigi;
 
 public class TestLauncher {
 
similarity index 92%
rename from util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java
rename to util-testing/club/wpia/gigi/email/CommandlineEmailProvider.java
index 263b4c49b6f3af34d71b16aa77eaa8ae907cb921..f6cc4fc98e5b448489e8be64b8fad69f245627ae 100644 (file)
@@ -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) {}
similarity index 94%
rename from util-testing/org/cacert/gigi/email/DelegateMailProvider.java
rename to util-testing/club/wpia/gigi/email/DelegateMailProvider.java
index 109aae8dc17f7d1bba931a9cb9d34d23d3d92dd1..1196f86141db3c53336523d519aa464ef99b9d80 100644 (file)
@@ -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;
similarity index 99%
rename from util-testing/org/cacert/gigi/email/TestEmailProvider.java
rename to util-testing/club/wpia/gigi/email/TestEmailProvider.java
index eb5eb820d795c8e21e10030404a0ce9d8def203c..92eb806781dc1a06d564c99995eee6a2d25b7acc 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.email;
+package club.wpia.gigi.email;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
similarity index 97%
rename from util-testing/org/cacert/gigi/localisation/FileIterable.java
rename to util-testing/club/wpia/gigi/localisation/FileIterable.java
index 33a9cade8a0ed790fef82d87534104d49ab796ee..410c610d8a35e131aae5bde8fad8cc76d695e94f 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.localisation;
+package club.wpia.gigi.localisation;
 
 import java.io.BufferedReader;
 import java.io.File;
similarity index 99%
rename from util-testing/org/cacert/gigi/localisation/TaintSource.java
rename to util-testing/club/wpia/gigi/localisation/TaintSource.java
index f17485e1296b5bd6ddf79c22f64bccc9aeffd25e..792d8d70ce5e98173b8b6822e8de207e83368312 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.localisation;
+package club.wpia.gigi.localisation;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
similarity index 98%
rename from util-testing/org/cacert/gigi/localisation/TranslationCollectingVisitor.java
rename to util-testing/club/wpia/gigi/localisation/TranslationCollectingVisitor.java
index a7b69418f63429a1dbe26081a93cb7cd6cbd2205..ab3719a64abb6a627cc9354920d6dc58a707569f 100644 (file)
@@ -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())) {
similarity index 97%
rename from util-testing/org/cacert/gigi/localisation/TranslationCollector.java
rename to util-testing/club/wpia/gigi/localisation/TranslationCollector.java
index 9b4f2a9fee3ceb21e5d910d486f65d7bbef7bc19..44df294e771d526ddbc89a80d91f09595e877ae8 100644 (file)
@@ -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<TaintSource> 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<File>(), ".java").toArray(new File[0]);
+        File[] fs = recurse(new File(new File(new File(base, "src"), "club"), "wpia"), new LinkedList<File>(), ".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<File>(), ".templ").toArray(new File[0]);
+        File[] ts = recurse(new File(new File(new File(base, "src"), "club"), "wpia"), new LinkedList<File>(), ".templ").toArray(new File[0]);
         for (File file : ts) {
             Template t = new Template(new InputStreamReader(new FileInputStream(file), "UTF-8"));
             LinkedList<String> i = new LinkedList<String>();
diff --git a/util-testing/club/wpia/gigi/localisation/conf.txt b/util-testing/club/wpia/gigi/localisation/conf.txt
new file mode 100644 (file)
index 0000000..e889b96
--- /dev/null
@@ -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
similarity index 92%
rename from util-testing/org/cacert/gigi/pages/Manager.java
rename to util-testing/club/wpia/gigi/pages/Manager.java
index 38b45f6eb11f6be12edeb5d69f5ee171e2d651df..af05ab49bf1d9213cc05ebd5811a6a77cb917490 100644 (file)
@@ -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 {
similarity index 98%
rename from util-testing/org/cacert/gigi/util/IOUtils.java
rename to util-testing/club/wpia/gigi/util/IOUtils.java
index c5dbd8db1f90c0b0e75ce42e7fc379c9dd240108..1a98a8457d7630b6037706f20d12d951ea3bd58f 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.CharArrayWriter;
similarity index 97%
rename from util-testing/org/cacert/gigi/util/SimpleSigner.java
rename to util-testing/club/wpia/gigi/util/SimpleSigner.java
index f2b97d7bcd958380088ebf432372f2e9eef36a62..99feda2314dd2a67a1a61ffec46d83f05f90453c 100644 (file)
@@ -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 (file)
index 30694f0..0000000
+++ /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
similarity index 93%
rename from util/org/cacert/gigi/util/DatabaseManager.java
rename to util/club/wpia/gigi/util/DatabaseManager.java
index a6626b746dbc9462c3bc708e96921e8fff73c3e5..8628103b0210f5ba0eb849f09292af7e6a9a7477 100644 (file)
@@ -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 {
 
similarity index 99%
rename from util/org/cacert/gigi/util/FetchLocales.java
rename to util/club/wpia/gigi/util/FetchLocales.java
index 0b61dcca65763b1196678a7fa4b74daa83e10cb8..8cd55e4962256db2f3d72899ffa2b5aaeeb2fbfa 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.io.File;
 import java.io.FileNotFoundException;
similarity index 98%
rename from util/org/cacert/gigi/util/HighFinancialValueFetcher.java
rename to util/club/wpia/gigi/util/HighFinancialValueFetcher.java
index abac278dbd9ea05b5fd54e7cea067bb0696d18d5..84d80feb5d77e8e5a239c8fb0be612a33c13c59f 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.io.BufferedReader;
 import java.io.File;
similarity index 94%
rename from util/org/cacert/gigi/util/HighFinancialValueFetcherAlexa.java
rename to util/club/wpia/gigi/util/HighFinancialValueFetcherAlexa.java
index 17c91825a9bfbc62935ebc47f7af6a7e8978fced..ae3ef536b524ef6801af274cb1d974f40d73c4ab 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.io.File;
 import java.io.PrintWriter;
similarity index 96%
rename from util/org/cacert/gigi/util/HighFinancialValueFetcherUmbrella.java
rename to util/club/wpia/gigi/util/HighFinancialValueFetcherUmbrella.java
index ef96a0fe83127bef0daf5b83a7a6252a72ec2111..321c3df4b22cf4cd515e171ed88a915a5361a7d3 100644 (file)
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package club.wpia.gigi.util;
 
 import java.io.File;
 import java.io.PrintWriter;