From: <go...@us...> - 2012-06-26 18:34:37
|
Revision: 13646 http://unicore.svn.sourceforge.net/unicore/?rev=13646&view=rev Author: golbi Date: 2012-06-26 18:34:25 +0000 (Tue, 26 Jun 2012) Log Message: ----------- Updated to secLib with Jetty 8 and new packages Modified Paths: -------------- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/FileAttributeSource.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/FileAttributeSourceBase.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/X509FileAttributeSource.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/gridmapfile/GridMapFileAuthoriser.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/gridmapfile/GridMapFileParser.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/ldap/LdapAuthoriser.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/PullTester.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLAssertionForwadingHandler.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLPullAuthoriser.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLPushAuthoriser.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/CredentialCache.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/XUUDB.java wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/XUUDBAuthoriser.java wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/gridmapfile/TestGridmapFileAuthoriser.java wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/ForwardService.java wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/ForwardingWSRFClient.java wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/MockPDP.java wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PullTestBase.java wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PullTestPreferredVo.java wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PushTest3.java wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PushTestBase.java wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/basic/JettyServer.java wsrflite/trunk/core/pom.xml wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/ContainerProperties.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/DeploymentManager.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/GatewayHandler.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/USEClientProperties.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/admin/AdminActionLoader.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/events/AsynchActionWithCallback.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/DefaultHome.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/ExpiryChecker.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/InstanceChecking.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/ResourceImpl.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/SecuredResourceImpl.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/messaging/MessagingImpl.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/Persistence.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/PersistenceManager.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/ContainerSecurityProperties.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/DSignCheck.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/DefaultContainerSecurityConfiguration.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/ETDAssertionForwarding.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/IAttributeSourceBase.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/IContainerSecurityConfiguration.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/NullAttributeSource.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/SecurityManager.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/TestConfigUtil.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/UASSelfCallChecker.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/UserAttributeCallback.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/pdp/AcceptingPdp.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/pdp/UnicoreXPDP.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/AttributeSourceConfigurator.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/AttributeSourcesChain.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/BaseAttributeSourcesChain.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/DynamicAttributeSourcesChain.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/server/JettyServer.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/server/USEJettyProperties.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/utils/TimeoutRunner.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/PropertyChecker.java wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/ServiceConfigReader.java wsrflite/trunk/core/src/test/java/de/fzj/unicore/wsrflite/security/MockAttributeSource.java wsrflite/trunk/core/src/test/java/de/fzj/unicore/wsrflite/security/TestAuthChainFactory.java wsrflite/trunk/core/src/test/java/de/fzj/unicore/wsrflite/security/TestSecurityManager.java wsrflite/trunk/pdp/src/main/java/eu/unicore/uas/pdp/argus/ArgusHerasafPolicyStore.java wsrflite/trunk/pdp/src/main/java/eu/unicore/uas/pdp/argus/ArgusPAP.java wsrflite/trunk/pdp/src/main/java/eu/unicore/uas/pdp/argus/ArgusPAPChecker.java wsrflite/trunk/pdp/src/main/java/eu/unicore/uas/pdp/argus/ArgusPAPClient.java wsrflite/trunk/pdp/src/main/java/eu/unicore/uas/pdp/local/LocalHerasafPDP.java wsrflite/trunk/pdp/src/main/java/eu/unicore/uas/pdp/local/LocalPolicyStore.java wsrflite/trunk/pdp/src/main/java/eu/unicore/uas/pdp/localsun/LocalSunPDP.java wsrflite/trunk/pdp/src/main/java/eu/unicore/uas/pdp/request/creator/HerasafXacml2RequestCreator.java wsrflite/trunk/pdp/src/main/java/eu/unicore/uas/pdp/request/creator/SunXacml1RequestCreator.java wsrflite/trunk/pdp/src/test/java/eu/unicore/uas/pdp/local/HerasafPerformanceCheck.java wsrflite/trunk/pdp/src/test/java/eu/unicore/uas/pdp/localsun/SunPerformanceCheck.java wsrflite/trunk/pom.xml wsrflite/trunk/rest/src/main/java/eu/unicore/services/rest/RestServlet.java wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/ws/cxf/CXFKernel.java wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/ws/cxf/CXFService.java wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/ws/cxf/WSRFInvoker.java wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/ws/impl/ModifiableResourceProperty.java wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/ws/impl/SecurityInfoResourceProperty.java wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/ws/impl/WSResourceHomeImpl.java wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/ws/impl/WSResourceImpl.java wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/ws/security/AccessControlHandler.java wsrflite/trunk/use-cxf/src/test/java/eu/unicore/services/ws/client/TestClient.java wsrflite/trunk/use-cxf/src/test/java/eu/unicore/services/ws/client/TestClientSSL.java wsrflite/trunk/use-cxf/src/test/java/eu/unicore/services/ws/exampleservice/MockPDP.java wsrflite/trunk/use-cxf/src/test/java/eu/unicore/services/ws/testutils/JettyTestCase.java wsrflite/trunk/use-cxfclient/pom.xml wsrflite/trunk/use-cxfclient/src/main/java/de/fzj/unicore/wsrflite/xfire/WSRFClientFactory.java wsrflite/trunk/use-cxfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/AdminServiceClient.java wsrflite/trunk/use-cxfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/BaseWSRFClient.java wsrflite/trunk/use-cxfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/Consumer.java wsrflite/trunk/use-cxfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/ExternalRegistryClient.java wsrflite/trunk/use-cxfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/MultiWSRFClient.java wsrflite/trunk/use-cxfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/NotificationClient.java wsrflite/trunk/use-cxfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/RegistryClient.java wsrflite/trunk/use-cxfclient/src/test/java/de/fzj/unicore/wsrflite/SimpleWSRFTest.java wsrflite/trunk/use-cxfclient/src/test/java/de/fzj/unicore/wsrflite/TestBaseWSRFClient.java wsrflite/trunk/use-cxfclient/src/test/java/de/fzj/unicore/wsrflite/testutils/AbstractTestBase.java wsrflite/trunk/use-cxfclient/src/test/java/de/fzj/unicore/wsrflite/testutils/JettyServer.java wsrflite/trunk/use-cxfclient/src/test/java/de/fzj/unicore/wsrflite/testutils/MockSecurityConfig.java wsrflite/trunk/wsrfclient/pom.xml wsrflite/trunk/wsrfclient/src/main/java/de/fzj/unicore/wsrflite/xfire/MTOMInHandler.java wsrflite/trunk/wsrfclient/src/main/java/de/fzj/unicore/wsrflite/xfire/MTOMOutHandler.java wsrflite/trunk/wsrfclient/src/main/java/de/fzj/unicore/wsrflite/xfire/WSRFClientFactory.java wsrflite/trunk/wsrfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/AdminServiceClient.java wsrflite/trunk/wsrfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/BaseWSRFClient.java wsrflite/trunk/wsrfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/Consumer.java wsrflite/trunk/wsrfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/ExternalRegistryClient.java wsrflite/trunk/wsrfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/MultiWSRFClient.java wsrflite/trunk/wsrfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/NotificationClient.java wsrflite/trunk/wsrfclient/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/client/RegistryClient.java wsrflite/trunk/wsrfclient/src/test/java/de/fzj/unicore/wsrflite/xmlbeans/TestBaseWSRFClient.java wsrflite/trunk/wsrfclient/src/test/java/de/fzj/unicore/wsrflite/xmlbeans/testutils/AbstractTestBase.java wsrflite/trunk/wsrfclient/src/test/java/de/fzj/unicore/wsrflite/xmlbeans/testutils/JettyServer.java wsrflite/trunk/wsrfclient/src/test/java/de/fzj/unicore/wsrflite/xmlbeans/testutils/MockSecurityConfig.java wsrflite/trunk/wsrfcore/src/main/doc/use-configuration.txt wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminServiceImpl.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/admin/service/CreateDefaultAdmin.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xfire/JettyTestCase.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xfire/WSRFInvoker.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xfire/XFireKernel.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xfire/XFireService.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xfire/security/AccessControlHandler.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/ModifiableResourceProperty.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/impl/SecurityInfoResourceProperty.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/impl/WSResourceHomeImpl.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/impl/WSResourceImpl.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/sg/impl/ServiceGroupImpl.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/sg/impl/ServiceGroupRegistrationImpl.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/wsn/impl/NotificationProducerSupport.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/wsn/impl/SubscriptionImpl.java wsrflite/trunk/wsrfcore/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/wsn/provider/WSNProvider.java wsrflite/trunk/wsrfcore/src/test/java/de/fzj/unicore/wsrflite/exampleservice/MockPDP.java wsrflite/trunk/wsrfcore/src/test/java/de/fzj/unicore/wsrflite/functional/TestMTOM.java wsrflite/trunk/wsrfcore/src/test/java/de/fzj/unicore/wsrflite/functional/client/TestClient.java wsrflite/trunk/wsrfcore/src/test/java/de/fzj/unicore/wsrflite/functional/client/TestClientSSL.java wsrflite/trunk/wsrfcore/src/test/java/de/fzj/unicore/wsrflite/functional/client/TestInvalidDSig.java wsrflite/trunk/wsrfcore/src/test/java/de/fzj/unicore/wsrflite/xfire/TestXFireJettyWebApp.java wsrflite/trunk/wsrfcore/src/test/java/de/fzj/unicore/wsrflite/xmlbeans/impl/TestSecurityInfoRP.java Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/FileAttributeSource.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/FileAttributeSource.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/FileAttributeSource.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -21,10 +21,10 @@ import de.fzj.unicore.wsrflite.security.IAttributeSource; import eu.emi.security.authn.x509.impl.X500NameUtils; -import eu.unicore.security.util.Log; import eu.unicore.security.SecurityTokens; import eu.unicore.security.SubjectAttributesHolder; import eu.unicore.security.XACMLAttribute; +import eu.unicore.util.Log; /** Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/FileAttributeSourceBase.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/FileAttributeSourceBase.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/FileAttributeSourceBase.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -17,7 +17,7 @@ import de.fzj.unicore.wsrflite.security.IAttributeSource; import eu.unicore.security.XACMLAttribute; import eu.unicore.security.XACMLAttribute.Type; -import eu.unicore.security.util.ConfigurationException; +import eu.unicore.util.configuration.ConfigurationException; /** * Code shared by both existing File sources Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/X509FileAttributeSource.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/X509FileAttributeSource.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/file/X509FileAttributeSource.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -25,8 +25,8 @@ import eu.unicore.security.SecurityTokens; import eu.unicore.security.SubjectAttributesHolder; import eu.unicore.security.XACMLAttribute; -import eu.unicore.security.util.ConfigurationException; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; +import eu.unicore.util.configuration.ConfigurationException; /** Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/gridmapfile/GridMapFileAuthoriser.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/gridmapfile/GridMapFileAuthoriser.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/gridmapfile/GridMapFileAuthoriser.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -26,8 +26,8 @@ import eu.unicore.security.SecurityTokens; import eu.unicore.security.SubjectAttributesHolder; import eu.unicore.security.XACMLAttribute; -import eu.unicore.security.util.ConfigurationException; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; +import eu.unicore.util.configuration.ConfigurationException; /** Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/gridmapfile/GridMapFileParser.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/gridmapfile/GridMapFileParser.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/gridmapfile/GridMapFileParser.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -15,7 +15,7 @@ import org.apache.log4j.Logger; import eu.emi.security.authn.x509.impl.OpensslNameUtils; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/ldap/LdapAuthoriser.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/ldap/LdapAuthoriser.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/ldap/LdapAuthoriser.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -14,7 +14,7 @@ import de.fzj.unicore.wsrflite.security.IAttributeSource; import eu.unicore.security.SecurityTokens; import eu.unicore.security.SubjectAttributesHolder; -import eu.unicore.security.util.ConfigurationException; +import eu.unicore.util.configuration.ConfigurationException; public class LdapAuthoriser implements IAttributeSource { Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/PullTester.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/PullTester.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/PullTester.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -30,8 +30,8 @@ import de.fzj.unicore.wsrflite.security.ContainerSecurityProperties; import de.fzj.unicore.wsrflite.security.IAttributeSource; import de.fzj.unicore.wsrflite.security.util.AttributeSourcesChain; -import eu.unicore.security.util.FilePropertiesHelper; -import eu.unicore.security.util.client.IClientConfiguration; +import eu.unicore.util.configuration.FilePropertiesHelper; +import eu.unicore.util.httpclient.IClientConfiguration; /** * This class provides a standalone program to test if configuration in vo.config for Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLAssertionForwadingHandler.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLAssertionForwadingHandler.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLAssertionForwadingHandler.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -17,8 +17,8 @@ import eu.unicore.samly2.assertion.Assertion; import eu.unicore.security.Client; import eu.unicore.security.SecurityTokens; -import eu.unicore.security.util.Log; -import eu.unicore.security.util.client.IClientConfiguration; +import eu.unicore.util.Log; +import eu.unicore.util.httpclient.IClientConfiguration; import pl.edu.icm.unicore.voutils.SAMLAttributePushInHandler; import pl.edu.icm.unicore.voutils.SAMLAttributePushOutHandler; Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLPullAuthoriser.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLPullAuthoriser.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLPullAuthoriser.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -22,7 +22,7 @@ import de.fzj.unicore.wsrflite.Kernel; import eu.unicore.security.SecurityTokens; import eu.unicore.security.SubjectAttributesHolder; -import eu.unicore.security.util.ConfigurationException; +import eu.unicore.util.configuration.ConfigurationException; /** * Wraps xfire-voutils {@link VOAttributeFetcher} to put xlogin and role attributes for Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLPushAuthoriser.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLPushAuthoriser.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/vo/SAMLPushAuthoriser.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -24,7 +24,7 @@ import de.fzj.unicore.wsrflite.xfire.XFireKernel; import eu.unicore.security.SecurityTokens; import eu.unicore.security.SubjectAttributesHolder; -import eu.unicore.security.util.ConfigurationException; +import eu.unicore.util.configuration.ConfigurationException; /** * VO push attribute source process attributes which were established in Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/CredentialCache.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/CredentialCache.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/CredentialCache.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -10,7 +10,7 @@ import org.apache.log4j.Logger; import eu.unicore.security.SubjectAttributesHolder; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * cache for authz info Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/XUUDB.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/XUUDB.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/XUUDB.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -2,7 +2,7 @@ import org.apache.log4j.Logger; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** Modified: wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/XUUDBAuthoriser.java =================================================================== --- wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/XUUDBAuthoriser.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/main/java/eu/unicore/uas/security/xuudb/XUUDBAuthoriser.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -22,15 +22,15 @@ import de.fzj.unicore.wsrflite.Kernel; import de.fzj.unicore.wsrflite.ThreadingServices; import de.fzj.unicore.wsrflite.security.IAttributeSource; -import eu.unicore.security.util.Log; -import eu.unicore.security.util.client.ConnectionUtil; -import eu.unicore.security.util.client.IClientConfiguration; import eu.unicore.security.xfireutil.client.XFireClientFactory; import de.fzj.unicore.wsrflite.utils.TimeoutRunner; import de.fzj.unicore.xuudb.X509Utils; import de.fzj.unicore.xuudb.interfaces.IPublic; import eu.unicore.security.SecurityTokens; import eu.unicore.security.SubjectAttributesHolder; +import eu.unicore.util.Log; +import eu.unicore.util.httpclient.ConnectionUtil; +import eu.unicore.util.httpclient.IClientConfiguration; /** * get authorisation attributes for users by asking an XUUDB Modified: wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/gridmapfile/TestGridmapFileAuthoriser.java =================================================================== --- wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/gridmapfile/TestGridmapFileAuthoriser.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/gridmapfile/TestGridmapFileAuthoriser.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -11,7 +11,7 @@ import de.fzj.unicore.wsrflite.security.IAttributeSource; import de.fzj.unicore.wsrflite.security.TestConfigUtil; import de.fzj.unicore.wsrflite.security.util.AttributeSourcesChain; -import eu.unicore.security.util.ConfigurationException; +import eu.unicore.util.configuration.ConfigurationException; public class TestGridmapFileAuthoriser { Modified: wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/ForwardService.java =================================================================== --- wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/ForwardService.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/ForwardService.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -26,7 +26,7 @@ import de.fzj.unicore.wsrflite.xmlbeans.exceptions.ResourceUnavailableFault; import de.fzj.unicore.wsrflite.xmlbeans.exceptions.ResourceUnknownFault; import de.fzj.unicore.wsrflite.xmlbeans.impl.WSResourceImpl; -import eu.unicore.security.util.client.IClientConfiguration; +import eu.unicore.util.httpclient.IClientConfiguration; public class ForwardService extends WSResourceImpl implements Forward { Modified: wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/ForwardingWSRFClient.java =================================================================== --- wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/ForwardingWSRFClient.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/ForwardingWSRFClient.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -11,7 +11,7 @@ import de.fzj.unicore.wsrflite.xfire.ClientException; import de.fzj.unicore.wsrflite.xmlbeans.client.BaseWSRFClient; -import eu.unicore.security.util.client.IClientConfiguration; +import eu.unicore.util.httpclient.IClientConfiguration; public class ForwardingWSRFClient extends BaseWSRFClient { Modified: wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/MockPDP.java =================================================================== --- wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/MockPDP.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/MockPDP.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -13,7 +13,7 @@ import de.fzj.unicore.wsrflite.security.pdp.UnicoreXPDP; import de.fzj.unicore.wsrflite.security.util.ResourceDescriptor; import eu.unicore.security.Client; -import eu.unicore.security.util.client.IClientConfiguration; +import eu.unicore.util.httpclient.IClientConfiguration; public class MockPDP implements UnicoreXPDP { Modified: wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PullTestBase.java =================================================================== --- wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PullTestBase.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PullTestBase.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -20,9 +20,9 @@ import de.fzj.unicore.wsrflite.xmlbeans.client.BaseWSRFClient; import eu.emi.security.authn.x509.impl.KeystoreCertChainValidator; import eu.emi.security.authn.x509.impl.KeystoreCredential; -import eu.unicore.security.util.client.DefaultClientConfiguration; -import eu.unicore.security.util.client.HttpUtils; import eu.unicore.security.xfireutil.client.XFireClientFactory; +import eu.unicore.util.httpclient.DefaultClientConfiguration; +import eu.unicore.util.httpclient.HttpUtils; /** * This test invokes unicoreX operation which gets all properties of a test service. Modified: wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PullTestPreferredVo.java =================================================================== --- wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PullTestPreferredVo.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PullTestPreferredVo.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -19,7 +19,7 @@ import de.fzj.unicore.wsrflite.ContainerProperties; import de.fzj.unicore.wsrflite.security.IAttributeSource; import de.fzj.unicore.wsrflite.xmlbeans.client.BaseWSRFClient; -import eu.unicore.security.util.client.DefaultClientConfiguration; +import eu.unicore.util.httpclient.DefaultClientConfiguration; import pl.edu.icm.unicore.uvos.engine.api.UVOSManagementInterface; /** Modified: wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PushTest3.java =================================================================== --- wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PushTest3.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PushTest3.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -27,7 +27,7 @@ import de.fzj.unicore.wsrflite.ContainerProperties; import eu.unicore.bugsreporter.annotation.RegressionTest; import eu.unicore.samly2.assertion.Assertion; -import eu.unicore.security.util.client.DefaultClientConfiguration; +import eu.unicore.util.httpclient.DefaultClientConfiguration; /** * This test invokes unicoreX operation which gets all properties of test service Modified: wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PushTestBase.java =================================================================== --- wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PushTestBase.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/PushTestBase.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -27,9 +27,9 @@ import eu.emi.security.authn.x509.impl.KeystoreCertChainValidator; import eu.emi.security.authn.x509.impl.KeystoreCredential; import eu.unicore.samly2.assertion.Assertion; -import eu.unicore.security.util.client.DefaultClientConfiguration; -import eu.unicore.security.util.client.HttpUtils; import eu.unicore.security.xfireutil.client.XFireClientFactory; +import eu.unicore.util.httpclient.DefaultClientConfiguration; +import eu.unicore.util.httpclient.HttpUtils; /** * This test invokes unicoreX operation which gets all properties of test service Modified: wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/basic/JettyServer.java =================================================================== --- wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/basic/JettyServer.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/aip/src/test/java/eu/unicore/uas/security/vo/basic/JettyServer.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -6,19 +6,18 @@ import java.security.KeyStoreException; import org.codehaus.xfire.transport.http.XFireServlet; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.handler.ContextHandlerCollection; -import org.mortbay.jetty.handler.DefaultHandler; -import org.mortbay.jetty.handler.HandlerCollection; -import org.mortbay.jetty.servlet.Context; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.servlet.ServletContextHandler; import eu.emi.security.authn.x509.impl.KeystoreCertChainValidator; import eu.emi.security.authn.x509.impl.KeystoreCredential; -import eu.unicore.security.util.ConfigurationException; -import eu.unicore.security.util.DefaultAuthnAndTrustConfiguration; -import eu.unicore.security.util.IAuthnAndTrustConfiguration; -import eu.unicore.security.util.jetty.JettyProperties; -import eu.unicore.security.util.jetty.JettyServerBase; +import eu.unicore.security.canl.DefaultAuthnAndTrustConfiguration; +import eu.unicore.security.canl.IAuthnAndTrustConfiguration; +import eu.unicore.util.configuration.ConfigurationException; +import eu.unicore.util.jetty.JettyProperties; +import eu.unicore.util.jetty.JettyServerBase; @@ -54,17 +53,14 @@ } @Override - protected Context createRootContext() throws ConfigurationException { - ContextHandlerCollection contexts = new ContextHandlerCollection(); - Context root=new Context(getServer(), "/", Context.SESSIONS); + protected Handler createRootHandler() throws ConfigurationException { + ServletContextHandler root=new ServletContextHandler(getServer(), "/", ServletContextHandler.SESSIONS); root.addServlet(XFireServlet.class, "/services/*"); HandlerCollection handlers = new HandlerCollection(); handlers.setHandlers(new Handler[]{ - contexts, root, new DefaultHandler()}); - getServer().setHandler(handlers); return root; } } Modified: wsrflite/trunk/core/pom.xml =================================================================== --- wsrflite/trunk/core/pom.xml 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/pom.xml 2012-06-26 18:34:25 UTC (rev 13646) @@ -63,14 +63,18 @@ <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-sslengine</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + </dependency> + <dependency> <groupId>de.fzj.unicore.metrix</groupId> <artifactId>metrix</artifactId> </dependency> Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/ContainerProperties.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/ContainerProperties.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/ContainerProperties.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -16,12 +16,12 @@ import de.fzj.unicore.wsrflite.persistence.Persistence; import de.fzj.unicore.wsrflite.persistence.PersistenceManager; -import eu.unicore.security.util.ConfigurationException; -import eu.unicore.security.util.DocumentationReferenceMeta; -import eu.unicore.security.util.DocumentationReferencePrefix; -import eu.unicore.security.util.Log; -import eu.unicore.security.util.PropertiesHelper; -import eu.unicore.security.util.PropertyMD; +import eu.unicore.util.Log; +import eu.unicore.util.configuration.ConfigurationException; +import eu.unicore.util.configuration.DocumentationReferenceMeta; +import eu.unicore.util.configuration.DocumentationReferencePrefix; +import eu.unicore.util.configuration.PropertiesHelper; +import eu.unicore.util.configuration.PropertyMD; /** * Provides an RW access to the base USE {@link Kernel} configuration. Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/DeploymentManager.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/DeploymentManager.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/DeploymentManager.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -19,7 +19,7 @@ import de.fzj.unicore.wsrflite.utils.deployment.DeploymentUtils; import de.fzj.unicore.wsrflite.utils.deployment.ListFilesByExtensionFilter; import de.fzj.unicore.wsrflite.utils.deployment.ServiceClassLoader; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * Manages (un-)deployment of services Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/GatewayHandler.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/GatewayHandler.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/GatewayHandler.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -19,10 +19,10 @@ import de.fzj.unicore.wsrflite.utils.TimeoutRunner; import de.fzj.unicore.wsrflite.utils.Utilities; import eu.emi.security.authn.x509.impl.X500NameUtils; -import eu.unicore.security.util.Log; -import eu.unicore.security.util.client.ConnectionUtil; -import eu.unicore.security.util.client.HttpUtils; -import eu.unicore.security.util.client.IClientConfiguration; +import eu.unicore.util.Log; +import eu.unicore.util.httpclient.ConnectionUtil; +import eu.unicore.util.httpclient.HttpUtils; +import eu.unicore.util.httpclient.IClientConfiguration; /** * Encapsulates the interaction with a Gateway. Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -79,9 +79,9 @@ import de.fzj.unicore.wsrflite.utils.deployment.NullServiceConfigurator; import de.fzj.unicore.wsrflite.utils.deployment.PropertyChecker; import de.fzj.unicore.wsrflite.utils.deployment.ServiceConfigReader; -import eu.unicore.security.util.ConfigurationException; -import eu.unicore.security.util.Log; -import eu.unicore.security.util.jetty.JettyProperties; +import eu.unicore.util.Log; +import eu.unicore.util.configuration.ConfigurationException; +import eu.unicore.util.jetty.JettyProperties; /** * Central class of WSRFlite, serves for lookup of components, services, and Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/USEClientProperties.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/USEClientProperties.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/USEClientProperties.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -10,10 +10,10 @@ import de.fzj.unicore.wsrflite.security.IContainerSecurityConfiguration; -import eu.unicore.security.util.ConfigurationException; -import eu.unicore.security.util.DocumentationReferencePrefix; -import eu.unicore.security.util.PropertyMD; -import eu.unicore.security.util.client.ClientProperties; +import eu.unicore.util.configuration.ConfigurationException; +import eu.unicore.util.configuration.DocumentationReferencePrefix; +import eu.unicore.util.configuration.PropertyMD; +import eu.unicore.util.httpclient.ClientProperties; /** * Simple extension of {@link ClientProperties}: sets ssl mode to the same value as containers ssl mode Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/admin/AdminActionLoader.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/admin/AdminActionLoader.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/admin/AdminActionLoader.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -8,7 +8,7 @@ import org.apache.log4j.Logger; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * helper to load admin actions from the class path Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/events/AsynchActionWithCallback.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/events/AsynchActionWithCallback.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/events/AsynchActionWithCallback.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -4,7 +4,7 @@ import de.fzj.unicore.wsrflite.Home; import de.fzj.unicore.wsrflite.Resource; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * helper class to perform some asynchronous operation and notify a {@link Resource} after the Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/DefaultHome.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/DefaultHome.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/DefaultHome.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -61,7 +61,7 @@ import de.fzj.unicore.wsrflite.security.util.AuthZAttributeStore; import de.fzj.unicore.wsrflite.utils.deployment.ServiceClassLoader; import eu.unicore.security.SecurityTokens; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * This is a basic implementation of the Home interface. Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/ExpiryChecker.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/ExpiryChecker.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/ExpiryChecker.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -43,7 +43,7 @@ import de.fzj.unicore.wsrflite.exceptions.ResourceUnavailableException; import de.fzj.unicore.wsrflite.exceptions.ResourceUnknownException; import de.fzj.unicore.wsrflite.persistence.Store; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * Checks Resource instance for lifetime expiry.<br/> Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/InstanceChecking.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/InstanceChecking.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/InstanceChecking.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -42,7 +42,7 @@ import de.fzj.unicore.wsrflite.Home; import de.fzj.unicore.wsrflite.exceptions.ResourceUnknownException; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * Run checks on all wsrf instances of a given service Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/ResourceImpl.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/ResourceImpl.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/ResourceImpl.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -54,7 +54,7 @@ import de.fzj.unicore.wsrflite.persistence.Persist; import de.fzj.unicore.wsrflite.persistence.PersistenceSettings; import de.fzj.unicore.wsrflite.utils.Utilities; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * Base implementation of the USE lifecycle interfaces<br/> Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/SecuredResourceImpl.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/SecuredResourceImpl.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/impl/SecuredResourceImpl.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -50,7 +50,7 @@ import eu.emi.security.authn.x509.X509Credential; import eu.unicore.security.Client; import eu.unicore.security.SecurityTokens; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * Implements the security aspects of {@link Resource}. Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/messaging/MessagingImpl.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/messaging/MessagingImpl.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/messaging/MessagingImpl.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -46,7 +46,7 @@ import de.fzj.unicore.persist.PersistenceFactory; import de.fzj.unicore.wsrflite.ContainerProperties; import de.fzj.unicore.wsrflite.messaging.impl.MessageBean; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * manages the internal messaging system Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -46,7 +46,7 @@ import de.fzj.unicore.persist.PersistenceException; import de.fzj.unicore.wsrflite.Kernel; import de.fzj.unicore.wsrflite.Resource; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * Base functionality shared by all persistence implementations Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/Persistence.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/Persistence.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/Persistence.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -24,7 +24,7 @@ import de.fzj.unicore.wsrflite.Kernel; import de.fzj.unicore.wsrflite.ThreadingServices; import de.fzj.unicore.wsrflite.exceptions.UnableToSetTerminationTimeException; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * use the Persistence framework for storing wsrf instances Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/PersistenceManager.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/PersistenceManager.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/persistence/PersistenceManager.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -44,7 +44,7 @@ import de.fzj.unicore.wsrflite.ContainerProperties; import de.fzj.unicore.wsrflite.Kernel; import de.fzj.unicore.wsrflite.Resource; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; public class PersistenceManager { Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/ContainerSecurityProperties.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/ContainerSecurityProperties.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/ContainerSecurityProperties.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -28,17 +28,17 @@ import eu.emi.security.authn.x509.impl.CertificateUtils; import eu.emi.security.authn.x509.impl.CertificateUtils.Encoding; -import eu.unicore.security.util.AuthnAndTrustProperties; -import eu.unicore.security.util.ConfigurationException; -import eu.unicore.security.util.CredentialProperties; -import eu.unicore.security.util.DocumentationReferenceMeta; -import eu.unicore.security.util.DocumentationReferencePrefix; -import eu.unicore.security.util.IAuthnAndTrustConfiguration; -import eu.unicore.security.util.Log; -import eu.unicore.security.util.LoggingStoreUpdateListener; -import eu.unicore.security.util.PropertiesHelper; -import eu.unicore.security.util.PropertyMD; -import eu.unicore.security.util.TruststoreProperties; +import eu.unicore.security.canl.AuthnAndTrustProperties; +import eu.unicore.security.canl.CredentialProperties; +import eu.unicore.security.canl.IAuthnAndTrustConfiguration; +import eu.unicore.security.canl.LoggingStoreUpdateListener; +import eu.unicore.security.canl.TruststoreProperties; +import eu.unicore.util.Log; +import eu.unicore.util.configuration.ConfigurationException; +import eu.unicore.util.configuration.DocumentationReferenceMeta; +import eu.unicore.util.configuration.DocumentationReferencePrefix; +import eu.unicore.util.configuration.PropertiesHelper; +import eu.unicore.util.configuration.PropertyMD; /** * USE security configuration implementation using a {@link Properties} source. Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/DSignCheck.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/DSignCheck.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/DSignCheck.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -7,10 +7,10 @@ import org.apache.log4j.Logger; import de.fzj.unicore.wsrflite.security.util.ResourceDescriptor; -import eu.unicore.security.util.Log; import eu.unicore.security.AuthenticationException; import eu.unicore.security.SecurityTokens; import eu.unicore.security.SignatureStatus; +import eu.unicore.util.Log; /** * if the requested action requires it, check whether we have Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/DefaultContainerSecurityConfiguration.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/DefaultContainerSecurityConfiguration.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/DefaultContainerSecurityConfiguration.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -8,7 +8,7 @@ import de.fzj.unicore.wsrflite.security.pdp.UnicoreXPDP; import eu.emi.security.authn.x509.X509CertChainValidator; -import eu.unicore.security.util.DefaultAuthnAndTrustConfiguration; +import eu.unicore.security.canl.DefaultAuthnAndTrustConfiguration; /** * Simple implementation of {@link IContainerSecurityConfiguration} as java bean. Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/ETDAssertionForwarding.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/ETDAssertionForwarding.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/ETDAssertionForwarding.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -14,8 +14,8 @@ import eu.unicore.security.Client; import eu.unicore.security.SecurityTokens; import eu.unicore.security.etd.TrustDelegation; -import eu.unicore.security.util.client.ETDClientSettings; -import eu.unicore.security.util.client.IClientConfiguration; +import eu.unicore.util.httpclient.ETDClientSettings; +import eu.unicore.util.httpclient.IClientConfiguration; /** * Utility methods which allow for easy configuration of {@link IClientProperties} Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/IAttributeSourceBase.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/IAttributeSourceBase.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/IAttributeSourceBase.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -35,7 +35,7 @@ import de.fzj.unicore.wsrflite.Kernel; import de.fzj.unicore.wsrflite.security.util.AttributeSourceConfigurator; import de.fzj.unicore.wsrflite.utils.TimeoutRunner; -import eu.unicore.security.util.ConfigurationException; +import eu.unicore.util.configuration.ConfigurationException; /** * IAttributeSourceBase provides the interface for UNICORE/X to retrieve authorisation information Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/IContainerSecurityConfiguration.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/IContainerSecurityConfiguration.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/IContainerSecurityConfiguration.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -37,7 +37,7 @@ import de.fzj.unicore.wsrflite.security.pdp.UnicoreXPDP; import eu.emi.security.authn.x509.X509CertChainValidator; -import eu.unicore.security.util.IAuthnAndTrustConfiguration; +import eu.unicore.security.canl.IAuthnAndTrustConfiguration; /** * Interface extends {@link IAuthnAndTrustConfiguration} with container security Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/NullAttributeSource.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/NullAttributeSource.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/NullAttributeSource.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -10,7 +10,7 @@ import eu.unicore.security.Client; import eu.unicore.security.SecurityTokens; import eu.unicore.security.SubjectAttributesHolder; -import eu.unicore.security.util.ConfigurationException; +import eu.unicore.util.configuration.ConfigurationException; public class NullAttributeSource implements IAttributeSource, IDynamicAttributeSource { public NullAttributeSource(){} Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/SecurityManager.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/SecurityManager.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/SecurityManager.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -55,7 +55,7 @@ import eu.unicore.security.SecurityTokens; import eu.unicore.security.SubjectAttributesHolder; import eu.unicore.security.Xlogin; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; /** * Provides an entry point for security related functionality of USE. In particular: Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/TestConfigUtil.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/TestConfigUtil.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/TestConfigUtil.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -8,7 +8,7 @@ import de.fzj.unicore.wsrflite.USEClientProperties; -import eu.unicore.security.util.client.ClientProperties; +import eu.unicore.util.httpclient.ClientProperties; import static de.fzj.unicore.wsrflite.security.ContainerSecurityProperties.*; Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/UASSelfCallChecker.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/UASSelfCallChecker.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/UASSelfCallChecker.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -10,7 +10,7 @@ import java.security.cert.X509Certificate; -import eu.unicore.security.util.SelfCallChecker; +import eu.unicore.security.SelfCallChecker; public class UASSelfCallChecker implements SelfCallChecker { Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/UserAttributeCallback.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/UserAttributeCallback.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/UserAttributeCallback.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -7,10 +7,10 @@ import org.apache.log4j.Logger; import org.apache.xmlbeans.XmlObject; -import eu.unicore.security.util.Log; -import eu.unicore.security.util.client.ETDClientSettings; import de.fzj.unicore.wsrflite.utils.Utilities; import eu.unicore.security.SecurityTokens; +import eu.unicore.util.Log; +import eu.unicore.util.httpclient.ETDClientSettings; /** * Callback class that handles additional attributes in the User assertion. * <p> Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/pdp/AcceptingPdp.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/pdp/AcceptingPdp.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/pdp/AcceptingPdp.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -9,7 +9,7 @@ import de.fzj.unicore.wsrflite.security.pdp.PDPResult.Decision; import de.fzj.unicore.wsrflite.security.util.ResourceDescriptor; import eu.unicore.security.Client; -import eu.unicore.security.util.client.IClientConfiguration; +import eu.unicore.util.httpclient.IClientConfiguration; /** * Trivial PDP always accepting everything Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/pdp/UnicoreXPDP.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/pdp/UnicoreXPDP.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/pdp/UnicoreXPDP.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -11,7 +11,7 @@ import de.fzj.unicore.wsrflite.security.IContainerSecurityConfiguration; import de.fzj.unicore.wsrflite.security.util.ResourceDescriptor; import eu.unicore.security.Client; -import eu.unicore.security.util.client.IClientConfiguration; +import eu.unicore.util.httpclient.IClientConfiguration; /** * A generic PDP interface. Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/AttributeSourceConfigurator.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/AttributeSourceConfigurator.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/AttributeSourceConfigurator.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -18,9 +18,9 @@ import de.fzj.unicore.wsrflite.security.IAttributeSource; import de.fzj.unicore.wsrflite.security.IAttributeSourceBase; import de.fzj.unicore.wsrflite.security.IDynamicAttributeSource; -import eu.unicore.security.util.ConfigurationException; -import eu.unicore.security.util.Log; -import eu.unicore.security.util.PropertyGroupHelper; +import eu.unicore.util.Log; +import eu.unicore.util.configuration.ConfigurationException; +import eu.unicore.util.configuration.PropertyGroupHelper; /** * Utility class used to configure attribute source Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/AttributeSourcesChain.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/AttributeSourcesChain.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/AttributeSourcesChain.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -45,8 +45,8 @@ import eu.unicore.security.AuthorisationException; import eu.unicore.security.SecurityTokens; import eu.unicore.security.SubjectAttributesHolder; -import eu.unicore.security.util.ConfigurationException; -import eu.unicore.security.util.Log; +import eu.unicore.util.Log; +import eu.unicore.util.configuration.ConfigurationException; /** * IAttributeSource implementation that combines the results from a chain of attribute sources using Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/BaseAttributeSourcesChain.java =================================================================== --- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/BaseAttributeSourcesChain.java 2012-06-26 18:25:25 UTC (rev 13645) +++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/security/util/BaseAttributeSourcesChain.java 2012-06-26 18:34:25 UTC (rev 13646) @@ -... [truncated message content] |