diff --git a/maxkey-core/src/test/java/com/connsec/radius/RadiusTest.java b/maxkey-core/src/test/java/com/connsec/radius/RadiusTest.java deleted file mode 100644 index 617cc151e..000000000 --- a/maxkey-core/src/test/java/com/connsec/radius/RadiusTest.java +++ /dev/null @@ -1,140 +0,0 @@ -/** - * - */ -package com.connsec.radius; - -import java.io.IOException; -import java.net.InetAddress; - -import net.jradius.client.RadiusClient; -import net.jradius.client.auth.MSCHAPv2Authenticator; -import net.jradius.client.auth.RadiusAuthenticator; -import net.jradius.dictionary.Attr_AcctInputOctets; -import net.jradius.dictionary.Attr_AcctOutputOctets; -import net.jradius.dictionary.Attr_AcctSessionId; -import net.jradius.dictionary.Attr_AcctSessionTime; -import net.jradius.dictionary.Attr_AcctStatusType; -import net.jradius.dictionary.Attr_AcctTerminateCause; -import net.jradius.dictionary.Attr_NASPort; -import net.jradius.dictionary.Attr_NASPortType; -import net.jradius.dictionary.Attr_ReplyMessage; -import net.jradius.dictionary.Attr_UserName; -import net.jradius.dictionary.Attr_UserPassword; -import net.jradius.exception.RadiusException; -import net.jradius.exception.UnknownAttributeException; -import net.jradius.packet.AccessAccept; -import net.jradius.packet.AccessRequest; -import net.jradius.packet.AccountingRequest; -import net.jradius.packet.RadiusPacket; -import net.jradius.packet.attribute.AttributeFactory; -import net.jradius.packet.attribute.AttributeList; -import net.jradius.util.RadiusRandom; - -/** - * @author Crystal.Sea - * - */ -public class RadiusTest { - - /** - * @param args - * @throws IOException - * @throws RadiusException - * @throws UnknownAttributeException - */ - public static void main(String[] args) { - // TODO Auto-generated method stub - AttributeFactory.loadAttributeDictionary("net.jradius.dictionary.AttributeDictionaryImpl"); - - try{ - InetAddress inetAddress=InetAddress.getByName("127.0.0.1"); - String sharedSecret="testing123"; - RadiusClient radiusClient = new RadiusClient( - inetAddress, // InetAddress - Address of remote RADIUS Server - sharedSecret, - 1812, - 1813, - 60); // String - Shared Secret for remote RADIUS Server - - System.out.println("RADIUS response from {}: {}"+radiusClient.getRemoteInetAddress().getCanonicalHostName()); - AttributeList attributeList = new AttributeList(); - - - //attributeList.add(new Attr_NASPortType(Attr_NASPortType.Wireless80211)); - attributeList.add(new Attr_NASPort(new Long(-1))); - attributeList.add(new Attr_UserName("lameuser")); - attributeList.add(new Attr_UserPassword("tttt")); - - AccessRequest request = new AccessRequest(radiusClient, attributeList); - - System.out.println("Sending:\n" + request.toString()); - - // RadiusAuthenticator auth =new MSCHAPv2Authenticator(); - RadiusAuthenticator auth = RadiusClient.getAuthProtocol("eap2"); - - RadiusPacket reply = radiusClient.authenticate(request,auth ,3); - - System.out.println("RADIUS response from {}: {}"+radiusClient.getRemoteInetAddress().getCanonicalHostName()+","+reply.getClass().getName()); - - if (reply == null) return; // Request Timed-out - - - System.out.println("getIdentifier:" + reply.getIdentifier()); - System.out.println("getcode:" + reply.getCode()); - - - - System.out.println("getAttributeList:\n" + reply.getAttributes().getAttributeList()); - System.out.println("Received:\n" + reply.toString()); - - boolean isAuthenticated = (reply instanceof AccessAccept); - - System.out.println("isAuthenticated : \n" + isAuthenticated); - - System.out.println("AccessReject : \n" + (reply instanceof net.jradius.packet.AccessReject)); - - System.out.println("PasswordReject : \n" + (reply instanceof net.jradius.packet.PasswordReject)); - - String replyMessage = (String) reply.getAttributeValue(Attr_ReplyMessage.TYPE); - - if (replyMessage != null) - { - System.out.println("Reply Message: " + replyMessage); - }else{ - System.out.println("Reply Message: " + "error . "); - } - - /* - attributeList.add(new Attr_AcctSessionId(RadiusRandom.getRandomString(24))); - - request = new AccountingRequest(radiusClient, attributeList); - request.addAttribute(new Attr_AcctStatusType(Attr_AcctStatusType.Start)); - - reply = radiusClient.accounting(request, 5); - - - request = new AccountingRequest(radiusClient, attributeList); - request.addAttribute(new Attr_AcctStatusType(Attr_AcctStatusType.Stop)); - request.addAttribute(new Attr_AcctInputOctets(new Long(10))); - request.addAttribute(new Attr_AcctOutputOctets(new Long(10))); - request.addAttribute(new Attr_AcctSessionTime(new Long(60))); - request.addAttribute(new Attr_AcctTerminateCause(Attr_AcctTerminateCause.UserRequest)); - - reply = radiusClient.accounting(request, 5);*/ - }catch(Exception e){ - e.printStackTrace(); - } - - - - } - - //��InetAddress �е���Ϣ��ʾ���� - public static void showInfo(InetAddress IP){ - String name = IP.getHostName(); - String address = IP.getHostAddress(); - System.out.println(name); - System.out.println(address); - System.out.println("------------------------------"); - } -} diff --git a/maxkey-core/src/test/java/com/connsec/cache/CacheFactoryTest.java b/maxkey-core/src/test/java/org/maxkey/cache/CacheFactoryTest.java similarity index 95% rename from maxkey-core/src/test/java/com/connsec/cache/CacheFactoryTest.java rename to maxkey-core/src/test/java/org/maxkey/cache/CacheFactoryTest.java index d870b979f..9332edf57 100644 --- a/maxkey-core/src/test/java/com/connsec/cache/CacheFactoryTest.java +++ b/maxkey-core/src/test/java/org/maxkey/cache/CacheFactoryTest.java @@ -1,7 +1,7 @@ /** * */ -package com.connsec.cache; +package org.maxkey.cache; import java.util.ArrayList; diff --git a/maxkey-core/src/test/java/com/connsec/cache/RandomCache.java b/maxkey-core/src/test/java/org/maxkey/cache/RandomCache.java similarity index 96% rename from maxkey-core/src/test/java/com/connsec/cache/RandomCache.java rename to maxkey-core/src/test/java/org/maxkey/cache/RandomCache.java index 019385d5a..18f13de61 100644 --- a/maxkey-core/src/test/java/com/connsec/cache/RandomCache.java +++ b/maxkey-core/src/test/java/org/maxkey/cache/RandomCache.java @@ -1,7 +1,7 @@ /** * */ -package com.connsec.cache; +package org.maxkey.cache; import java.util.Random; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/Base64UtilsTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/Base64UtilsTest.java similarity index 96% rename from maxkey-core/src/test/java/com/connsec/crypto/Base64UtilsTest.java rename to maxkey-core/src/test/java/org/maxkey/crypto/Base64UtilsTest.java index 71426638f..bb35315c0 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/Base64UtilsTest.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/Base64UtilsTest.java @@ -1,4 +1,4 @@ -package com.connsec.crypto; +package org.maxkey.crypto; import org.junit.Test; import org.maxkey.crypto.Base64Utils; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/DigestUtilsTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/DigestUtilsTest.java similarity index 97% rename from maxkey-core/src/test/java/com/connsec/crypto/DigestUtilsTest.java rename to maxkey-core/src/test/java/org/maxkey/crypto/DigestUtilsTest.java index 08983e932..0983aa62b 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/DigestUtilsTest.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/DigestUtilsTest.java @@ -1,4 +1,4 @@ -package com.connsec.crypto; +package org.maxkey.crypto; import java.util.Date; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/KeyGen.java b/maxkey-core/src/test/java/org/maxkey/crypto/KeyGen.java similarity index 97% rename from maxkey-core/src/test/java/com/connsec/crypto/KeyGen.java rename to maxkey-core/src/test/java/org/maxkey/crypto/KeyGen.java index aa504b062..ea6e4286f 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/KeyGen.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/KeyGen.java @@ -1,4 +1,4 @@ -package com.connsec.crypto; +package org.maxkey.crypto; import java.io.FileOutputStream; import java.io.ObjectOutputStream; import java.security.KeyPair; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/Md5SumTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/Md5SumTest.java similarity index 95% rename from maxkey-core/src/test/java/com/connsec/crypto/Md5SumTest.java rename to maxkey-core/src/test/java/org/maxkey/crypto/Md5SumTest.java index dbe64b661..aeaa439c1 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/Md5SumTest.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/Md5SumTest.java @@ -1,4 +1,4 @@ -package com.connsec.crypto; +package org.maxkey.crypto; import java.io.File; import java.io.FileNotFoundException; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/PasswordGenTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/PasswordGenTest.java similarity index 93% rename from maxkey-core/src/test/java/com/connsec/crypto/PasswordGenTest.java rename to maxkey-core/src/test/java/org/maxkey/crypto/PasswordGenTest.java index 964fdaf0b..df5705e2c 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/PasswordGenTest.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/PasswordGenTest.java @@ -1,4 +1,4 @@ -package com.connsec.crypto; +package org.maxkey.crypto; import org.maxkey.crypto.password.PasswordGen; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/RSAUtilsTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/RSAUtilsTest.java similarity index 97% rename from maxkey-core/src/test/java/com/connsec/crypto/RSAUtilsTest.java rename to maxkey-core/src/test/java/org/maxkey/crypto/RSAUtilsTest.java index 651cbe995..fe0ea19ce 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/RSAUtilsTest.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/RSAUtilsTest.java @@ -1,4 +1,4 @@ -package com.connsec.crypto; +package org.maxkey.crypto; import java.security.Key; import java.util.Map; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/ReciprocalUtilsTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java similarity index 98% rename from maxkey-core/src/test/java/com/connsec/crypto/ReciprocalUtilsTest.java rename to maxkey-core/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java index 2b58e308c..5e3cad109 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/ReciprocalUtilsTest.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java @@ -1,4 +1,4 @@ -package com.connsec.crypto; +package org.maxkey.crypto; import java.io.UnsupportedEncodingException; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/RsaMessage.java b/maxkey-core/src/test/java/org/maxkey/crypto/RsaMessage.java similarity index 99% rename from maxkey-core/src/test/java/com/connsec/crypto/RsaMessage.java rename to maxkey-core/src/test/java/org/maxkey/crypto/RsaMessage.java index 2a44fd35a..9606413a6 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/RsaMessage.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/RsaMessage.java @@ -1,4 +1,4 @@ -package com.connsec.crypto; +package org.maxkey.crypto; import java.io.FileInputStream; import java.io.ObjectInputStream; import java.security.Key; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/SCryptPasswordEncoderTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java similarity index 96% rename from maxkey-core/src/test/java/com/connsec/crypto/SCryptPasswordEncoderTest.java rename to maxkey-core/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java index fe554ffba..b40d08f45 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/SCryptPasswordEncoderTest.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java @@ -1,4 +1,4 @@ -package com.connsec.crypto; +package org.maxkey.crypto; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/cert/X509CertUtilsTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java similarity index 99% rename from maxkey-core/src/test/java/com/connsec/crypto/cert/X509CertUtilsTest.java rename to maxkey-core/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java index 4dd96afc5..d093be230 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/cert/X509CertUtilsTest.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java @@ -1,4 +1,4 @@ -package com.connsec.crypto.cert; +package org.maxkey.crypto.cert; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/cert/X509V3CertGenTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java similarity index 97% rename from maxkey-core/src/test/java/com/connsec/crypto/cert/X509V3CertGenTest.java rename to maxkey-core/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java index f08f71df7..10c2c6cc5 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/cert/X509V3CertGenTest.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java @@ -1,4 +1,4 @@ -package com.connsec.crypto.cert; +package org.maxkey.crypto.cert; import java.io.FileOutputStream; import java.security.KeyPair; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/signature/DsaSignerTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java similarity index 96% rename from maxkey-core/src/test/java/com/connsec/crypto/signature/DsaSignerTest.java rename to maxkey-core/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java index 59444df48..981a2d1b2 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/signature/DsaSignerTest.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java @@ -1,4 +1,4 @@ -package com.connsec.crypto.signature; +package org.maxkey.crypto.signature; import java.util.Map; diff --git a/maxkey-core/src/test/java/com/connsec/crypto/signature/RsaSignerTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java similarity index 97% rename from maxkey-core/src/test/java/com/connsec/crypto/signature/RsaSignerTest.java rename to maxkey-core/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java index accd93497..749c3d6c3 100644 --- a/maxkey-core/src/test/java/com/connsec/crypto/signature/RsaSignerTest.java +++ b/maxkey-core/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java @@ -1,7 +1,7 @@ /** * */ -package com.connsec.crypto.signature; +package org.maxkey.crypto.signature; import java.util.Map; diff --git a/maxkey-core/src/test/java/com/connsec/json/util/JsonUtilsTest.java b/maxkey-core/src/test/java/org/maxkey/json/util/JsonUtilsTest.java similarity index 94% rename from maxkey-core/src/test/java/com/connsec/json/util/JsonUtilsTest.java rename to maxkey-core/src/test/java/org/maxkey/json/util/JsonUtilsTest.java index 09e5d1bc3..4345dcf3d 100644 --- a/maxkey-core/src/test/java/com/connsec/json/util/JsonUtilsTest.java +++ b/maxkey-core/src/test/java/org/maxkey/json/util/JsonUtilsTest.java @@ -1,4 +1,4 @@ -package com.connsec.json.util; +package org.maxkey.json.util; import org.maxkey.domain.Groups; import org.maxkey.pretty.impl.JsonPretty; diff --git a/maxkey-core/src/test/java/com/connsec/mail/MailTest.java b/maxkey-core/src/test/java/org/maxkey/mail/MailTest.java similarity index 96% rename from maxkey-core/src/test/java/com/connsec/mail/MailTest.java rename to maxkey-core/src/test/java/org/maxkey/mail/MailTest.java index f0dc8dd42..38546a81a 100644 --- a/maxkey-core/src/test/java/com/connsec/mail/MailTest.java +++ b/maxkey-core/src/test/java/org/maxkey/mail/MailTest.java @@ -1,4 +1,4 @@ -package com.connsec.mail; +package org.maxkey.mail; import org.apache.commons.mail.DefaultAuthenticator; import org.apache.commons.mail.Email; diff --git a/maxkey-core/src/test/java/com/connsec/otp/algorithm/HmacOTPTest.java b/maxkey-core/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java similarity index 95% rename from maxkey-core/src/test/java/com/connsec/otp/algorithm/HmacOTPTest.java rename to maxkey-core/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java index fd379ac19..130e2baef 100644 --- a/maxkey-core/src/test/java/com/connsec/otp/algorithm/HmacOTPTest.java +++ b/maxkey-core/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java @@ -1,4 +1,4 @@ -package com.connsec.otp.algorithm; +package org.maxkey.otp.algorithm; import java.security.InvalidKeyException; diff --git a/maxkey-core/src/test/java/com/connsec/otp/algorithm/KeyUriFormatTest.java b/maxkey-core/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java similarity index 96% rename from maxkey-core/src/test/java/com/connsec/otp/algorithm/KeyUriFormatTest.java rename to maxkey-core/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java index d2646c9fa..9fc901331 100644 --- a/maxkey-core/src/test/java/com/connsec/otp/algorithm/KeyUriFormatTest.java +++ b/maxkey-core/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java @@ -1,4 +1,4 @@ -package com.connsec.otp.algorithm; +package org.maxkey.otp.algorithm; import java.io.File; diff --git a/maxkey-core/src/test/java/com/connsec/otp/algorithm/RQcodeTest.java b/maxkey-core/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java similarity index 98% rename from maxkey-core/src/test/java/com/connsec/otp/algorithm/RQcodeTest.java rename to maxkey-core/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java index ee2fe2678..53c004cfc 100644 --- a/maxkey-core/src/test/java/com/connsec/otp/algorithm/RQcodeTest.java +++ b/maxkey-core/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java @@ -1,4 +1,4 @@ -package com.connsec.otp.algorithm; +package org.maxkey.otp.algorithm; import java.io.File; diff --git a/maxkey-core/src/test/java/com/connsec/otp/algorithm/TimeBasedOTPTest.java b/maxkey-core/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java similarity index 98% rename from maxkey-core/src/test/java/com/connsec/otp/algorithm/TimeBasedOTPTest.java rename to maxkey-core/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java index 5c6193624..28155f531 100644 --- a/maxkey-core/src/test/java/com/connsec/otp/algorithm/TimeBasedOTPTest.java +++ b/maxkey-core/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java @@ -1,4 +1,4 @@ -package com.connsec.otp.algorithm; +package org.maxkey.otp.algorithm; import java.text.DateFormat; import java.text.ParseException; diff --git a/maxkey-core/src/test/java/org/maxkey/package-info.java b/maxkey-core/src/test/java/org/maxkey/package-info.java new file mode 100644 index 000000000..0a3825098 --- /dev/null +++ b/maxkey-core/src/test/java/org/maxkey/package-info.java @@ -0,0 +1 @@ +package org.maxkey; \ No newline at end of file diff --git a/maxkey-core/src/test/java/com/connsec/persistence/derby/DerbyTest.java b/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java similarity index 96% rename from maxkey-core/src/test/java/com/connsec/persistence/derby/DerbyTest.java rename to maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java index ef900bf3c..c7801857b 100644 --- a/maxkey-core/src/test/java/com/connsec/persistence/derby/DerbyTest.java +++ b/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java @@ -1,4 +1,4 @@ -package com.connsec.persistence.derby; +package org.maxkey.persistence.derby; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; diff --git a/maxkey-core/src/test/java/com/connsec/persistence/ldap/ActiveDirectoryUtilsTest.java b/maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java similarity index 97% rename from maxkey-core/src/test/java/com/connsec/persistence/ldap/ActiveDirectoryUtilsTest.java rename to maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java index 1b0efd0ad..e460f9e68 100644 --- a/maxkey-core/src/test/java/com/connsec/persistence/ldap/ActiveDirectoryUtilsTest.java +++ b/maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java @@ -1,4 +1,4 @@ -package com.connsec.persistence.ldap; +package org.maxkey.persistence.ldap; import javax.naming.NamingException; import javax.naming.directory.DirContext; diff --git a/maxkey-core/src/test/java/com/connsec/rest/AuthorizationHeaderTest.java b/maxkey-core/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java similarity index 93% rename from maxkey-core/src/test/java/com/connsec/rest/AuthorizationHeaderTest.java rename to maxkey-core/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java index b36f2c369..364e35bec 100644 --- a/maxkey-core/src/test/java/com/connsec/rest/AuthorizationHeaderTest.java +++ b/maxkey-core/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java @@ -1,4 +1,4 @@ -package com.connsec.rest; +package org.maxkey.rest; import org.junit.Test; import org.maxkey.util.AuthorizationHeaderUtils; diff --git a/maxkey-core/src/test/java/com/connsec/util/DateUtilsTest.java b/maxkey-core/src/test/java/org/maxkey/util/DateUtilsTest.java similarity index 99% rename from maxkey-core/src/test/java/com/connsec/util/DateUtilsTest.java rename to maxkey-core/src/test/java/org/maxkey/util/DateUtilsTest.java index 913fc0d4c..09122b5c8 100644 --- a/maxkey-core/src/test/java/com/connsec/util/DateUtilsTest.java +++ b/maxkey-core/src/test/java/org/maxkey/util/DateUtilsTest.java @@ -1,4 +1,4 @@ -package com.connsec.util; +package org.maxkey.util; import java.util.Date; diff --git a/maxkey-core/src/test/java/com/connsec/util/EthernetAddressTest.java b/maxkey-core/src/test/java/org/maxkey/util/EthernetAddressTest.java similarity index 87% rename from maxkey-core/src/test/java/com/connsec/util/EthernetAddressTest.java rename to maxkey-core/src/test/java/org/maxkey/util/EthernetAddressTest.java index ddd268413..8e2d061c2 100644 --- a/maxkey-core/src/test/java/com/connsec/util/EthernetAddressTest.java +++ b/maxkey-core/src/test/java/org/maxkey/util/EthernetAddressTest.java @@ -1,4 +1,4 @@ -package com.connsec.util; +package org.maxkey.util; import org.maxkey.util.EthernetAddress; diff --git a/maxkey-core/src/test/java/com/connsec/util/IdSequenceTest.java b/maxkey-core/src/test/java/org/maxkey/util/IdSequenceTest.java similarity index 91% rename from maxkey-core/src/test/java/com/connsec/util/IdSequenceTest.java rename to maxkey-core/src/test/java/org/maxkey/util/IdSequenceTest.java index 859bea7a3..81ab02350 100644 --- a/maxkey-core/src/test/java/com/connsec/util/IdSequenceTest.java +++ b/maxkey-core/src/test/java/org/maxkey/util/IdSequenceTest.java @@ -1,4 +1,4 @@ -package com.connsec.util; +package org.maxkey.util; public class IdSequenceTest { diff --git a/maxkey-core/src/test/java/com/connsec/util/MacAddressTest.java b/maxkey-core/src/test/java/org/maxkey/util/MacAddressTest.java similarity index 88% rename from maxkey-core/src/test/java/com/connsec/util/MacAddressTest.java rename to maxkey-core/src/test/java/org/maxkey/util/MacAddressTest.java index 991f6dbc9..7f752d1e3 100644 --- a/maxkey-core/src/test/java/com/connsec/util/MacAddressTest.java +++ b/maxkey-core/src/test/java/org/maxkey/util/MacAddressTest.java @@ -1,4 +1,4 @@ -package com.connsec.util; +package org.maxkey.util; import org.maxkey.util.MacAddress; diff --git a/maxkey-core/src/test/java/com/connsec/util/ObjectTransformerTest.java b/maxkey-core/src/test/java/org/maxkey/util/ObjectTransformerTest.java similarity index 99% rename from maxkey-core/src/test/java/com/connsec/util/ObjectTransformerTest.java rename to maxkey-core/src/test/java/org/maxkey/util/ObjectTransformerTest.java index 16f7fe775..c9219b5da 100644 --- a/maxkey-core/src/test/java/com/connsec/util/ObjectTransformerTest.java +++ b/maxkey-core/src/test/java/org/maxkey/util/ObjectTransformerTest.java @@ -1,4 +1,4 @@ -package com.connsec.util; +package org.maxkey.util; import org.maxkey.domain.UserInfo; import org.maxkey.util.ObjectTransformer; diff --git a/maxkey-core/src/test/java/com/connsec/util/PathUtilsTest.java b/maxkey-core/src/test/java/org/maxkey/util/PathUtilsTest.java similarity index 92% rename from maxkey-core/src/test/java/com/connsec/util/PathUtilsTest.java rename to maxkey-core/src/test/java/org/maxkey/util/PathUtilsTest.java index 2e94220f6..fd9849480 100644 --- a/maxkey-core/src/test/java/com/connsec/util/PathUtilsTest.java +++ b/maxkey-core/src/test/java/org/maxkey/util/PathUtilsTest.java @@ -1,4 +1,4 @@ -package com.connsec.util; +package org.maxkey.util; import org.junit.Test; import org.maxkey.util.PathUtils; diff --git a/maxkey-core/src/test/java/com/connsec/util/SqlPrettyTest.java b/maxkey-core/src/test/java/org/maxkey/util/SqlPrettyTest.java similarity index 92% rename from maxkey-core/src/test/java/com/connsec/util/SqlPrettyTest.java rename to maxkey-core/src/test/java/org/maxkey/util/SqlPrettyTest.java index b46c8ce7c..4bb475c0f 100644 --- a/maxkey-core/src/test/java/com/connsec/util/SqlPrettyTest.java +++ b/maxkey-core/src/test/java/org/maxkey/util/SqlPrettyTest.java @@ -1,4 +1,4 @@ -package com.connsec.util; +package org.maxkey.util; import org.maxkey.pretty.impl.SqlPretty; diff --git a/maxkey-core/src/test/java/com/connsec/util/StringGeneratorTest.java b/maxkey-core/src/test/java/org/maxkey/util/StringGeneratorTest.java similarity index 96% rename from maxkey-core/src/test/java/com/connsec/util/StringGeneratorTest.java rename to maxkey-core/src/test/java/org/maxkey/util/StringGeneratorTest.java index e020039b8..7cf4374de 100644 --- a/maxkey-core/src/test/java/com/connsec/util/StringGeneratorTest.java +++ b/maxkey-core/src/test/java/org/maxkey/util/StringGeneratorTest.java @@ -1,4 +1,4 @@ -package com.connsec.util; +package org.maxkey.util; import java.util.UUID; diff --git a/maxkey-core/src/test/java/com/connsec/util/UUIDGeneratorTest.java b/maxkey-core/src/test/java/org/maxkey/util/UUIDGeneratorTest.java similarity index 97% rename from maxkey-core/src/test/java/com/connsec/util/UUIDGeneratorTest.java rename to maxkey-core/src/test/java/org/maxkey/util/UUIDGeneratorTest.java index 78bf96ad7..669cacf9a 100644 --- a/maxkey-core/src/test/java/com/connsec/util/UUIDGeneratorTest.java +++ b/maxkey-core/src/test/java/org/maxkey/util/UUIDGeneratorTest.java @@ -1,4 +1,4 @@ -package com.connsec.util; +package org.maxkey.util; import java.util.Date; //import java.util.UUID; diff --git a/maxkey-core/src/test/java/com/connsec/word/CharacterCase.java b/maxkey-core/src/test/java/org/maxkey/word/CharacterCase.java similarity index 90% rename from maxkey-core/src/test/java/com/connsec/word/CharacterCase.java rename to maxkey-core/src/test/java/org/maxkey/word/CharacterCase.java index dbf7cc41d..2efde1ed5 100644 --- a/maxkey-core/src/test/java/com/connsec/word/CharacterCase.java +++ b/maxkey-core/src/test/java/org/maxkey/word/CharacterCase.java @@ -1,4 +1,4 @@ -package com.connsec.word; +package org.maxkey.word; public class CharacterCase { diff --git a/maxkey-core/src/test/java/com/connsec/word/SubStr.java b/maxkey-core/src/test/java/org/maxkey/word/SubStr.java similarity index 89% rename from maxkey-core/src/test/java/com/connsec/word/SubStr.java rename to maxkey-core/src/test/java/org/maxkey/word/SubStr.java index 4476ea715..e32b3b26a 100644 --- a/maxkey-core/src/test/java/com/connsec/word/SubStr.java +++ b/maxkey-core/src/test/java/org/maxkey/word/SubStr.java @@ -1,4 +1,4 @@ -package com.connsec.word; +package org.maxkey.word; public class SubStr {