From 10ed6557c631d5feee8541badd0c9f16a9e791c6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 25 Nov 2014 13:10:18 +0000 Subject: [PATCH] New project conventions git-svn-id: https://svn.argeo.org/commons/trunk@7530 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.security.core/.classpath | 14 +++++++------- org.argeo.security.core/bnd.bnd | 4 ++++ org.argeo.security.core/build.properties | 7 +++---- .../test/resources => ext/test}/log4j.properties | 0 .../test}/org/argeo/security/PasswordSandbox.java | 0 .../crypto/PasswordBasedEncryptionTest.java | 0 .../argeo/security/NodeAuthenticationToken.java | 0 .../org/argeo/security/OsAuthenticationToken.java | 0 .../org/argeo/security/SecurityUtils.java | 0 .../org/argeo/security/SystemAuthentication.java | 0 .../org/argeo/security/SystemExecutionService.java | 0 .../org/argeo/security/UserAdminService.java | 0 .../security/core/AbstractSystemExecution.java | 0 .../security/core/AsyncSystemTaskExecutor.java | 0 ...henticatedApplicationContextInitialization.java | 0 .../core/AuthenticationProvidersRegister.java | 0 .../security/core/ConsoleCallbackHandler.java | 0 .../security/core/InternalAuthentication.java | 0 .../core/KeyBasedSystemExecutionService.java | 0 .../core/MatchingAuthenticationProvider.java | 0 .../security/core/OsAuthenticationProvider.java | 0 .../org/argeo/security/core/OsgiModuleLabel.java | 0 .../security/core/SimpleRoleRegistration.java | 0 .../org/argeo/security/crypto/AbstractKeyring.java | 0 .../org/argeo/security/crypto/CryptoKeyring.java | 0 .../argeo/security/crypto/KeyringLoginModule.java | 0 .../argeo/security/crypto/PBEKeySpecCallback.java | 0 .../security/crypto/PasswordBasedEncryption.java | 0 .../org/argeo/security/jcr/JcrKeyring.java | 0 .../org/argeo/security/jcr/JcrSecurityModel.java | 0 .../org/argeo/security/jcr/JcrUserDetails.java | 0 .../security/jcr/OsJcrAuthenticationProvider.java | 0 .../argeo/security/jcr/OsJcrUserAdminService.java | 0 .../jcr/RemoteJcrAuthenticationProvider.java | 0 .../security/jcr/RemoteJcrRepositoryWrapper.java | 0 .../security/jcr/SecureThreadBoundSession.java | 0 .../argeo/security/jcr/SimpleJcrSecurityModel.java | 0 .../rememberme/JcrPersistentTokenRepository.java | 0 .../org/argeo/security/log4j/SecureLogger.java | 0 .../org/argeo/security/json/gandalf2.json | 1 - 40 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 org.argeo.security.core/bnd.bnd rename org.argeo.security.core/{src/test/resources => ext/test}/log4j.properties (100%) rename org.argeo.security.core/{src/test/java => ext/test}/org/argeo/security/PasswordSandbox.java (100%) rename org.argeo.security.core/{src/test/java => ext/test}/org/argeo/security/crypto/PasswordBasedEncryptionTest.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/NodeAuthenticationToken.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/OsAuthenticationToken.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/SecurityUtils.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/SystemAuthentication.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/SystemExecutionService.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/UserAdminService.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/core/AbstractSystemExecution.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/core/AsyncSystemTaskExecutor.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/core/AuthenticationProvidersRegister.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/core/ConsoleCallbackHandler.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/core/InternalAuthentication.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/core/KeyBasedSystemExecutionService.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/core/MatchingAuthenticationProvider.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/core/OsAuthenticationProvider.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/core/OsgiModuleLabel.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/core/SimpleRoleRegistration.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/crypto/AbstractKeyring.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/crypto/CryptoKeyring.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/crypto/KeyringLoginModule.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/crypto/PBEKeySpecCallback.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/crypto/PasswordBasedEncryption.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/jcr/JcrKeyring.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/jcr/JcrSecurityModel.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/jcr/JcrUserDetails.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/jcr/OsJcrAuthenticationProvider.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/jcr/OsJcrUserAdminService.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/jcr/SecureThreadBoundSession.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/jcr/SimpleJcrSecurityModel.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java (100%) rename org.argeo.security.core/src/{main/java => }/org/argeo/security/log4j/SecureLogger.java (100%) delete mode 100644 org.argeo.security.core/src/test/resources/org/argeo/security/json/gandalf2.json diff --git a/org.argeo.security.core/.classpath b/org.argeo.security.core/.classpath index b639b537c..91d2c42e5 100644 --- a/org.argeo.security.core/.classpath +++ b/org.argeo.security.core/.classpath @@ -1,10 +1,10 @@ - - - - - >> - - + + + + + diff --git a/org.argeo.security.core/bnd.bnd b/org.argeo.security.core/bnd.bnd new file mode 100644 index 000000000..2bbd9c3b8 --- /dev/null +++ b/org.argeo.security.core/bnd.bnd @@ -0,0 +1,4 @@ +Bundle-ActivationPolicy: lazy +Import-Package:org.bouncycastle.*;resolution:=optional,\ +javax.jcr.security,\ +* diff --git a/org.argeo.security.core/build.properties b/org.argeo.security.core/build.properties index 788870d98..c988eeb5d 100644 --- a/org.argeo.security.core/build.properties +++ b/org.argeo.security.core/build.properties @@ -7,7 +7,6 @@ additional.bundles = org.springframework.transaction,\ org.apache.log4j,\ slf4j.api,\ slf4j.org.apache.commons.logging -source.. = src/main/java/,\ - src/main/resources/,\ - src/test/java/,\ - src/test/resources/ +source.. = src/,\ + ext/test/ +bin.. = bin/ diff --git a/org.argeo.security.core/src/test/resources/log4j.properties b/org.argeo.security.core/ext/test/log4j.properties similarity index 100% rename from org.argeo.security.core/src/test/resources/log4j.properties rename to org.argeo.security.core/ext/test/log4j.properties diff --git a/org.argeo.security.core/src/test/java/org/argeo/security/PasswordSandbox.java b/org.argeo.security.core/ext/test/org/argeo/security/PasswordSandbox.java similarity index 100% rename from org.argeo.security.core/src/test/java/org/argeo/security/PasswordSandbox.java rename to org.argeo.security.core/ext/test/org/argeo/security/PasswordSandbox.java diff --git a/org.argeo.security.core/src/test/java/org/argeo/security/crypto/PasswordBasedEncryptionTest.java b/org.argeo.security.core/ext/test/org/argeo/security/crypto/PasswordBasedEncryptionTest.java similarity index 100% rename from org.argeo.security.core/src/test/java/org/argeo/security/crypto/PasswordBasedEncryptionTest.java rename to org.argeo.security.core/ext/test/org/argeo/security/crypto/PasswordBasedEncryptionTest.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/NodeAuthenticationToken.java b/org.argeo.security.core/src/org/argeo/security/NodeAuthenticationToken.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/NodeAuthenticationToken.java rename to org.argeo.security.core/src/org/argeo/security/NodeAuthenticationToken.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/OsAuthenticationToken.java b/org.argeo.security.core/src/org/argeo/security/OsAuthenticationToken.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/OsAuthenticationToken.java rename to org.argeo.security.core/src/org/argeo/security/OsAuthenticationToken.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/SecurityUtils.java b/org.argeo.security.core/src/org/argeo/security/SecurityUtils.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/SecurityUtils.java rename to org.argeo.security.core/src/org/argeo/security/SecurityUtils.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/SystemAuthentication.java b/org.argeo.security.core/src/org/argeo/security/SystemAuthentication.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/SystemAuthentication.java rename to org.argeo.security.core/src/org/argeo/security/SystemAuthentication.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/SystemExecutionService.java b/org.argeo.security.core/src/org/argeo/security/SystemExecutionService.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/SystemExecutionService.java rename to org.argeo.security.core/src/org/argeo/security/SystemExecutionService.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java b/org.argeo.security.core/src/org/argeo/security/UserAdminService.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java rename to org.argeo.security.core/src/org/argeo/security/UserAdminService.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/core/AbstractSystemExecution.java b/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/core/AbstractSystemExecution.java rename to org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/core/AsyncSystemTaskExecutor.java b/org.argeo.security.core/src/org/argeo/security/core/AsyncSystemTaskExecutor.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/core/AsyncSystemTaskExecutor.java rename to org.argeo.security.core/src/org/argeo/security/core/AsyncSystemTaskExecutor.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java b/org.argeo.security.core/src/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java rename to org.argeo.security.core/src/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticationProvidersRegister.java b/org.argeo.security.core/src/org/argeo/security/core/AuthenticationProvidersRegister.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticationProvidersRegister.java rename to org.argeo.security.core/src/org/argeo/security/core/AuthenticationProvidersRegister.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/core/ConsoleCallbackHandler.java b/org.argeo.security.core/src/org/argeo/security/core/ConsoleCallbackHandler.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/core/ConsoleCallbackHandler.java rename to org.argeo.security.core/src/org/argeo/security/core/ConsoleCallbackHandler.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/core/InternalAuthentication.java b/org.argeo.security.core/src/org/argeo/security/core/InternalAuthentication.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/core/InternalAuthentication.java rename to org.argeo.security.core/src/org/argeo/security/core/InternalAuthentication.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/core/KeyBasedSystemExecutionService.java b/org.argeo.security.core/src/org/argeo/security/core/KeyBasedSystemExecutionService.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/core/KeyBasedSystemExecutionService.java rename to org.argeo.security.core/src/org/argeo/security/core/KeyBasedSystemExecutionService.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/core/MatchingAuthenticationProvider.java b/org.argeo.security.core/src/org/argeo/security/core/MatchingAuthenticationProvider.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/core/MatchingAuthenticationProvider.java rename to org.argeo.security.core/src/org/argeo/security/core/MatchingAuthenticationProvider.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java b/org.argeo.security.core/src/org/argeo/security/core/OsAuthenticationProvider.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java rename to org.argeo.security.core/src/org/argeo/security/core/OsAuthenticationProvider.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/core/OsgiModuleLabel.java b/org.argeo.security.core/src/org/argeo/security/core/OsgiModuleLabel.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/core/OsgiModuleLabel.java rename to org.argeo.security.core/src/org/argeo/security/core/OsgiModuleLabel.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/core/SimpleRoleRegistration.java b/org.argeo.security.core/src/org/argeo/security/core/SimpleRoleRegistration.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/core/SimpleRoleRegistration.java rename to org.argeo.security.core/src/org/argeo/security/core/SimpleRoleRegistration.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/crypto/AbstractKeyring.java b/org.argeo.security.core/src/org/argeo/security/crypto/AbstractKeyring.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/crypto/AbstractKeyring.java rename to org.argeo.security.core/src/org/argeo/security/crypto/AbstractKeyring.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/crypto/CryptoKeyring.java b/org.argeo.security.core/src/org/argeo/security/crypto/CryptoKeyring.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/crypto/CryptoKeyring.java rename to org.argeo.security.core/src/org/argeo/security/crypto/CryptoKeyring.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/crypto/KeyringLoginModule.java b/org.argeo.security.core/src/org/argeo/security/crypto/KeyringLoginModule.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/crypto/KeyringLoginModule.java rename to org.argeo.security.core/src/org/argeo/security/crypto/KeyringLoginModule.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/crypto/PBEKeySpecCallback.java b/org.argeo.security.core/src/org/argeo/security/crypto/PBEKeySpecCallback.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/crypto/PBEKeySpecCallback.java rename to org.argeo.security.core/src/org/argeo/security/crypto/PBEKeySpecCallback.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/crypto/PasswordBasedEncryption.java b/org.argeo.security.core/src/org/argeo/security/crypto/PasswordBasedEncryption.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/crypto/PasswordBasedEncryption.java rename to org.argeo.security.core/src/org/argeo/security/crypto/PasswordBasedEncryption.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrKeyring.java b/org.argeo.security.core/src/org/argeo/security/jcr/JcrKeyring.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrKeyring.java rename to org.argeo.security.core/src/org/argeo/security/jcr/JcrKeyring.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrSecurityModel.java b/org.argeo.security.core/src/org/argeo/security/jcr/JcrSecurityModel.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrSecurityModel.java rename to org.argeo.security.core/src/org/argeo/security/jcr/JcrSecurityModel.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrUserDetails.java b/org.argeo.security.core/src/org/argeo/security/jcr/JcrUserDetails.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrUserDetails.java rename to org.argeo.security.core/src/org/argeo/security/jcr/JcrUserDetails.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrAuthenticationProvider.java b/org.argeo.security.core/src/org/argeo/security/jcr/OsJcrAuthenticationProvider.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrAuthenticationProvider.java rename to org.argeo.security.core/src/org/argeo/security/jcr/OsJcrAuthenticationProvider.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrUserAdminService.java b/org.argeo.security.core/src/org/argeo/security/jcr/OsJcrUserAdminService.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrUserAdminService.java rename to org.argeo.security.core/src/org/argeo/security/jcr/OsJcrUserAdminService.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java b/org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java rename to org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java b/org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java rename to org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java b/org.argeo.security.core/src/org/argeo/security/jcr/SecureThreadBoundSession.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java rename to org.argeo.security.core/src/org/argeo/security/jcr/SecureThreadBoundSession.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SimpleJcrSecurityModel.java b/org.argeo.security.core/src/org/argeo/security/jcr/SimpleJcrSecurityModel.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/jcr/SimpleJcrSecurityModel.java rename to org.argeo.security.core/src/org/argeo/security/jcr/SimpleJcrSecurityModel.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java b/org.argeo.security.core/src/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java rename to org.argeo.security.core/src/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java diff --git a/org.argeo.security.core/src/main/java/org/argeo/security/log4j/SecureLogger.java b/org.argeo.security.core/src/org/argeo/security/log4j/SecureLogger.java similarity index 100% rename from org.argeo.security.core/src/main/java/org/argeo/security/log4j/SecureLogger.java rename to org.argeo.security.core/src/org/argeo/security/log4j/SecureLogger.java diff --git a/org.argeo.security.core/src/test/resources/org/argeo/security/json/gandalf2.json b/org.argeo.security.core/src/test/resources/org/argeo/security/json/gandalf2.json deleted file mode 100644 index 73918229b..000000000 --- a/org.argeo.security.core/src/test/resources/org/argeo/security/json/gandalf2.json +++ /dev/null @@ -1 +0,0 @@ -{"roles":["ROLE_ADMIN","ROLE_USER"],"userNatures":[{"description":"Superuser","email":"admin@localhost","firstName":"Gandalf","lastName":"User","type":"org.argeo.security.nature.SimpleUserNature"},{"mobile":null,"telephoneNumber":null,"type":"org.argeo.security.nature.CoworkerNature"}],"username":"gandalf2","enabled":true,"password":"{SHA}ieSV55Qc+eQOaYDRSha/AjzNTJE=","authorities":[{"authority":"ROLE_ADMIN"},{"authority":"ROLE_USER"}],"accountNonExpired":true,"accountNonLocked":true,"credentialsNonExpired":true} \ No newline at end of file -- 2.30.2