You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dj...@apache.org on 2006/12/30 19:01:04 UTC
svn commit: r491261 [4/8] - in /directory/sandbox/triplesec-jacc: ./
admin-api/ admin-api/src/main/java/org/apache/
admin-api/src/main/java/org/apache/directory/
admin-api/src/main/java/org/apache/directory/triplesec/
admin-api/src/main/java/org/apache...
Modified: directory/sandbox/triplesec-jacc/integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/integration/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/integration/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/integration/pom.xml Sat Dec 30 10:00:46 2006
@@ -105,7 +105,7 @@
<configuration>
<systemProperties>
<property>
- <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+ <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
<value>${basedir}/src/test/resources</value>
</property>
</systemProperties>
Modified: directory/sandbox/triplesec-jacc/integration/src/main/java/org/apache/directory/triplesec/integration/TriplesecIntegration.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/integration/src/main/java/org/apache/directory/triplesec/integration/TriplesecIntegration.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/integration/src/main/java/org/apache/directory/triplesec/integration/TriplesecIntegration.java (original)
+++ directory/sandbox/triplesec-jacc/integration/src/main/java/org/apache/directory/triplesec/integration/TriplesecIntegration.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.integration;
+package org.apache.directory.triplesec.integration;
import junit.framework.TestCase;
@@ -32,8 +32,8 @@
import org.apache.mina.util.AvailablePortFinder;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Expand;
-import org.safehaus.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.Service;
+import org.apache.directory.triplesec.TriplesecInstallationLayout;
+import org.apache.directory.triplesec.Service;
/**
@@ -45,7 +45,7 @@
* directory.
*
* Generally one can create a src/test/resource directory for a project and
- * point the org.safehaus.triplesec.unit.resource.dir property to the absolute
+ * point the org.apache.directory.triplesec.unit.resource.dir property to the absolute
* path for this directory. Absolute paths must be used, however with Maven
* the ${basedir} macro can be used in the project.properties file to set this
* path in a position independent fashion. Within an IDE the test run must
@@ -68,11 +68,11 @@
public class TriplesecIntegration extends TestCase
{
/** the resources property to set */
- public static final String RESOURCES_DIRECTORY = "org.safehaus.triplesec.integration.resourcesDirectory";
+ public static final String RESOURCES_DIRECTORY = "org.apache.directory.triplesec.integration.resourcesDirectory";
/** a comma delimited list of web applications */
- public static final String WEBAPPS_PROPERTY = "org.safehaus.triplesec.integration.webapps";
+ public static final String WEBAPPS_PROPERTY = "org.apache.directory.triplesec.integration.webapps";
/** the base property for a the path to a webapp war */
- public static final String WEBAPPWARBASE_PROPERTY = "org.safehaus.triplesec.integration.webappWarBase";
+ public static final String WEBAPPWARBASE_PROPERTY = "org.apache.directory.triplesec.integration.webappWarBase";
/** the SLF4J logger for this class */
private static final Logger log = LoggerFactory.getLogger( TriplesecIntegration.class );
Modified: directory/sandbox/triplesec-jacc/integration/src/test/java/org/apache/directory/triplesec/integration/TriplesecIntegrationITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/integration/src/test/java/org/apache/directory/triplesec/integration/TriplesecIntegrationITest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/integration/src/test/java/org/apache/directory/triplesec/integration/TriplesecIntegrationITest.java (original)
+++ directory/sandbox/triplesec-jacc/integration/src/test/java/org/apache/directory/triplesec/integration/TriplesecIntegrationITest.java Sat Dec 30 10:00:46 2006
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.safehaus.triplesec.integration;
+package org.apache.directory.triplesec.integration;
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/sandbox/triplesec-jacc/integration/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/integration/src/test/resources/server.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/integration/src/test/resources/server.xml (original)
+++ directory/sandbox/triplesec-jacc/integration/src/test/resources/server.xml Sat Dec 30 10:00:46 2006
@@ -11,8 +11,8 @@
<prop key="java.naming.security.principal">uid=admin,ou=system</prop>
<prop key="java.naming.security.credentials">secret</prop>
<prop key="java.naming.provider.url">dc=example,dc=com</prop>
- <prop key="java.naming.factory.state">org.safehaus.triplesec.store.ProfileStateFactory</prop>
- <prop key="java.naming.factory.object">org.safehaus.triplesec.store.ProfileObjectFactory</prop>
+ <prop key="java.naming.factory.state">org.apache.directory.triplesec.store.ProfileStateFactory</prop>
+ <prop key="java.naming.factory.object">org.apache.directory.triplesec.store.ProfileObjectFactory</prop>
<prop key="kdc.primary.realm">EXAMPLE.COM</prop>
<prop key="kdc.principal">krbtgt/EXAMPLE.COM@EXAMPLE.COM</prop>
@@ -37,12 +37,12 @@
<prop key="safehaus.entry.basedn">ou=Users,dc=example,dc=com</prop>
<prop key="safehaus.load.testdata">true</prop>
- <prop key="kerberos.sam.type.7">org.safehaus.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
+ <prop key="kerberos.sam.type.7">org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
</props>
</property>
</bean>
- <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+ <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
<property name="workingDirectory"><value>partitions</value></property>
<property name="allowAnonymousAccess"><value>false</value></property>
<property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
</property>
<property name="activationConfiguration">
- <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+ <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
<property name="enableDecoyMidlet"><value>true</value></property>
<property name="otpLength"><value>6</value></property>
<property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
</property>
<property name="smsConfiguration">
- <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+ <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
<property name="smsUsername"><value>hauskeys</value></property>
<property name="smsPassword"><value>secret</value></property>
<property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
</property>
<property name="smtpConfiguration">
- <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+ <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
<property name="smtpAuthenticate"><value>false</value></property>
<!-- uncomment and set above property if authentication is required by mail server
<property name="smtpUsername"><value>hauskeys</value></property>
@@ -122,7 +122,7 @@
<bean class="org.apache.directory.server.core.schema.bootstrap.JavaSchema"/>
<bean class="org.apache.directory.server.core.schema.bootstrap.Krb5kdcSchema"/>
<bean class="org.apache.directory.server.core.schema.bootstrap.SystemSchema"/>
- <bean class="org.safehaus.triplesec.store.schema.SafehausSchema"/>
+ <bean class="org.apache.directory.triplesec.store.schema.SafehausSchema"/>
</set>
</property>
@@ -204,7 +204,7 @@
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name"><value>policyProtectionService</value></property>
<property name="interceptor">
- <bean class="org.safehaus.triplesec.store.interceptor.PolicyProtectionInterceptor" />
+ <bean class="org.apache.directory.triplesec.store.interceptor.PolicyProtectionInterceptor" />
</property>
</bean>
</list>
Modified: directory/sandbox/triplesec-jacc/itest-data/src/main/resources/server.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/itest-data/src/main/resources/server.ldif?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/itest-data/src/main/resources/server.ldif (original)
+++ directory/sandbox/triplesec-jacc/itest-data/src/main/resources/server.ldif Sat Dec 30 10:00:46 2006
@@ -359,12 +359,12 @@
objectClass: policyRole
roleName: mockRole1
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
+permClassName: org.apache.directory.triplesec.guardian.StringPermission
-dn: grant=mockPerm0, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm0, permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm0
@@ -374,12 +374,12 @@
objectClass: policyRole
roleName: mockRole2
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole2,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole2,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
+permClassName: org.apache.directory.triplesec.guardian.StringPermission
-dn: grant=mockPerm1, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole2,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm1, permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole2,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm1
@@ -391,17 +391,17 @@
#grants: mockPerm2
roleName: mockRole3
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole3,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole3,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
+permClassName: org.apache.directory.triplesec.guardian.StringPermission
-dn: grant=mockPerm3, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole3,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm3, permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole3,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm3
-dn: grant=mockPerm2, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole3,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm2, permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole3,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm2
@@ -416,32 +416,32 @@
#grants: mockPerm4
roleName: mockRole4
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
+permClassName: org.apache.directory.triplesec.guardian.StringPermission
-dn: grant=mockPerm9, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm9, permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm9
-dn: grant=mockPerm7, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm7, permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm7
-dn: grant=mockPerm6, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm6, permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm6
-dn: grant=mockPerm5, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm5, permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm5
-dn: grant=mockPerm4, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm4, permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm4
@@ -473,12 +473,12 @@
user: akarasulu
roles: mockRole2
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile2,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permClassName=org.apache.directory.triplesec.guardian.StringPermission, profileId=mockProfile2,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
+permClassName: org.apache.directory.triplesec.guardian.StringPermission
-dn: grant=mockPerm0, permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile2,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm0, permClassName=org.apache.directory.triplesec.guardian.StringPermission, profileId=mockProfile2,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm0
@@ -492,17 +492,17 @@
user: akarasulu
roles: mockRole3
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile3,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permClassName=org.apache.directory.triplesec.guardian.StringPermission, profileId=mockProfile3,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
+permClassName: org.apache.directory.triplesec.guardian.StringPermission
-dn: grant=mockPerm7, permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile3,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm7, permClassName=org.apache.directory.triplesec.guardian.StringPermission, profileId=mockProfile3,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm7
-dn: grant=mockPerm0, permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile3,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm0, permClassName=org.apache.directory.triplesec.guardian.StringPermission, profileId=mockProfile3,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm0
@@ -517,17 +517,17 @@
user: akarasulu
profileId: mockProfile4
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile4,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permClassName=org.apache.directory.triplesec.guardian.StringPermission, profileId=mockProfile4,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
+permClassName: org.apache.directory.triplesec.guardian.StringPermission
-dn: deny=mockPerm7, permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile4,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: deny=mockPerm7, permClassName=org.apache.directory.triplesec.guardian.StringPermission, profileId=mockProfile4,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permDeny
deny: mockPerm7
-dn: grant=mockPerm0, permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile4,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: grant=mockPerm0, permClassName=org.apache.directory.triplesec.guardian.StringPermission, profileId=mockProfile4,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
objectClass: permGrant
grant: mockPerm0
Modified: directory/sandbox/triplesec-jacc/jaas/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/jaas/pom.xml Sat Dec 30 10:00:46 2006
@@ -81,7 +81,7 @@
<configuration>
<systemProperties>
<property>
- <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+ <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
<value>${basedir}/src/test/resources</value>
</property>
</systemProperties>
@@ -103,7 +103,7 @@
<configuration>
<systemProperties>
<property>
- <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+ <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
<value>${basedir}/src/test/resources</value>
</property>
</systemProperties>
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountDisabledException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountDisabledException.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountDisabledException.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountDisabledException.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import org.safehaus.otp.HotpErrorConstants;
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountLockedOutException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountLockedOutException.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountLockedOutException.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountLockedOutException.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import org.safehaus.otp.HotpErrorConstants;
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/HotpLoginException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/HotpLoginException.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/HotpLoginException.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/HotpLoginException.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import org.safehaus.otp.HotpErrorConstants;
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/OldSafehausLoginModule.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/OldSafehausLoginModule.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/OldSafehausLoginModule.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/OldSafehausLoginModule.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import java.util.Map;
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PasscodeCallback.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PasscodeCallback.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PasscodeCallback.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PasscodeCallback.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import javax.security.auth.callback.Callback;
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PolicyCallback.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PolicyCallback.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PolicyCallback.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PolicyCallback.java Sat Dec 30 10:00:46 2006
@@ -17,12 +17,12 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import javax.security.auth.callback.Callback;
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
/**
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PreauthFailedException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PreauthFailedException.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PreauthFailedException.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/PreauthFailedException.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import org.safehaus.otp.HotpErrorConstants;
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ProfileIdCallback.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ProfileIdCallback.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ProfileIdCallback.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ProfileIdCallback.java Sat Dec 30 10:00:46 2006
@@ -18,7 +18,7 @@
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import javax.security.auth.callback.Callback;
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/RealmCallback.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/RealmCallback.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/RealmCallback.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/RealmCallback.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import javax.security.auth.callback.Callback;
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchInProgressException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchInProgressException.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchInProgressException.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchInProgressException.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import org.safehaus.otp.HotpErrorConstants;
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchStartingException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchStartingException.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchStartingException.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchStartingException.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import org.safehaus.otp.HotpErrorConstants;
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausLoginModule.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausLoginModule.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausLoginModule.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausLoginModule.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import java.util.Hashtable;
@@ -37,8 +37,7 @@
import javax.security.auth.callback.PasswordCallback;
import org.safehaus.otp.HotpErrorConstants;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.guardian.RealmPolicy;
+import org.apache.directory.triplesec.guardian.RealmPolicy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausPrincipal.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausPrincipal.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausPrincipal.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausPrincipal.java Sat Dec 30 10:00:46 2006
@@ -17,12 +17,12 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import java.security.Principal;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.guardian.RealmPolicy;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.RealmPolicy;
/**
Modified: directory/sandbox/triplesec-jacc/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleIntegrationTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleIntegrationTest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleIntegrationTest.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleIntegrationTest.java Sat Dec 30 10:00:46 2006
@@ -18,7 +18,7 @@
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
import java.io.IOException;
import java.security.Principal;
@@ -34,9 +34,9 @@
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
-import org.safehaus.triplesec.guardian.RealmPolicy;
-import org.safehaus.triplesec.guardian.RealmPolicyFactory;
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.guardian.RealmPolicy;
+import org.apache.directory.triplesec.guardian.RealmPolicyFactory;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
/**
* @version $Rev:$ $Date:$
@@ -65,7 +65,7 @@
props.setProperty( "applicationPrincipalDN", "appName=" + APP_NAME + ",ou=applications," + BASE_URL );
props.setProperty( "applicationCredentials", "testing" );
- Class.forName( "org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver" );
+ Class.forName( "org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver" );
realmPolicy = RealmPolicyFactory.
newInstance( providerUrl, props );
}
Modified: directory/sandbox/triplesec-jacc/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleTest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleTest.java (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleTest.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
Modified: directory/sandbox/triplesec-jacc/jaas/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jaas/src/test/resources/server.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/jaas/src/test/resources/server.xml (original)
+++ directory/sandbox/triplesec-jacc/jaas/src/test/resources/server.xml Sat Dec 30 10:00:46 2006
@@ -11,8 +11,8 @@
<prop key="java.naming.security.principal">uid=admin,ou=system</prop>
<prop key="java.naming.security.credentials">secret</prop>
<prop key="java.naming.provider.url">dc=example,dc=com</prop>
- <prop key="java.naming.factory.state">org.safehaus.triplesec.store.ProfileStateFactory</prop>
- <prop key="java.naming.factory.object">org.safehaus.triplesec.store.ProfileObjectFactory</prop>
+ <prop key="java.naming.factory.state">org.apache.directory.triplesec.store.ProfileStateFactory</prop>
+ <prop key="java.naming.factory.object">org.apache.directory.triplesec.store.ProfileObjectFactory</prop>
<prop key="kdc.primary.realm">EXAMPLE.COM</prop>
<prop key="kdc.principal">krbtgt/EXAMPLE.COM@EXAMPLE.COM</prop>
@@ -37,12 +37,12 @@
<prop key="safehaus.entry.basedn">ou=Users,dc=example,dc=com</prop>
<prop key="safehaus.load.testdata">true</prop>
- <prop key="kerberos.sam.type.7">org.safehaus.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
+ <prop key="kerberos.sam.type.7">org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
</props>
</property>
</bean>
- <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+ <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
<property name="workingDirectory"><value>partitions</value></property>
<property name="allowAnonymousAccess"><value>false</value></property>
<property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
</property>
<property name="activationConfiguration">
- <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+ <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
<property name="enableDecoyMidlet"><value>true</value></property>
<property name="otpLength"><value>6</value></property>
<property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
</property>
<property name="smsConfiguration">
- <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+ <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
<property name="smsUsername"><value>hauskeys</value></property>
<property name="smsPassword"><value>secret</value></property>
<property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
</property>
<property name="smtpConfiguration">
- <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+ <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
<property name="smtpAuthenticate"><value>false</value></property>
<!-- uncomment and set above property if authentication is required by mail server
<property name="smtpUsername"><value>hauskeys</value></property>
@@ -121,7 +121,7 @@
<bean class="org.apache.directory.server.core.schema.bootstrap.JavaSchema"/>
<bean class="org.apache.directory.server.core.schema.bootstrap.Krb5kdcSchema"/>
<bean class="org.apache.directory.server.core.schema.bootstrap.SystemSchema"/>
- <bean class="org.safehaus.triplesec.store.schema.SafehausSchema"/>
+ <bean class="org.apache.directory.triplesec.store.schema.SafehausSchema"/>
</set>
</property>
@@ -203,7 +203,7 @@
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name"><value>policyProtectionService</value></property>
<property name="interceptor">
- <bean class="org.safehaus.triplesec.store.interceptor.PolicyProtectionInterceptor" />
+ <bean class="org.apache.directory.triplesec.store.interceptor.PolicyProtectionInterceptor" />
</property>
</bean>
</list>
Modified: directory/sandbox/triplesec-jacc/main/conf/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/main/conf/server.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/main/conf/server.xml (original)
+++ directory/sandbox/triplesec-jacc/main/conf/server.xml Sat Dec 30 10:00:46 2006
@@ -11,8 +11,8 @@
<prop key="java.naming.security.principal">uid=admin,ou=system</prop>
<prop key="java.naming.security.credentials">secret</prop>
<prop key="java.naming.provider.url">dc=example,dc=com</prop>
- <prop key="java.naming.factory.state">org.safehaus.triplesec.store.ProfileStateFactory</prop>
- <prop key="java.naming.factory.object">org.safehaus.triplesec.store.ProfileObjectFactory</prop>
+ <prop key="java.naming.factory.state">org.apache.directory.triplesec.store.ProfileStateFactory</prop>
+ <prop key="java.naming.factory.object">org.apache.directory.triplesec.store.ProfileObjectFactory</prop>
<prop key="kdc.primary.realm">EXAMPLE.COM</prop>
<prop key="kdc.principal">krbtgt/EXAMPLE.COM@EXAMPLE.COM</prop>
@@ -37,12 +37,12 @@
<prop key="safehaus.entry.basedn">ou=Users,dc=example,dc=com</prop>
<prop key="safehaus.load.testdata">true</prop>
- <prop key="kerberos.sam.type.7">org.safehaus.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
+ <prop key="kerberos.sam.type.7">org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
</props>
</property>
</bean>
- <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+ <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
<property name="workingDirectory"><value>partitions</value></property>
<property name="allowAnonymousAccess"><value>false</value></property>
<property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
</property>
<property name="activationConfiguration">
- <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+ <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
<property name="enableDecoyMidlet"><value>true</value></property>
<property name="otpLength"><value>6</value></property>
<property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
</property>
<property name="smsConfiguration">
- <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+ <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
<property name="smsUsername"><value>hauskeys</value></property>
<property name="smsPassword"><value>secret</value></property>
<property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
</property>
<property name="smtpConfiguration">
- <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+ <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
<property name="smtpAuthenticate"><value>false</value></property>
<!-- uncomment and set above property if authentication is required by mail server
<property name="smtpUsername"><value>hauskeys</value></property>
@@ -121,7 +121,7 @@
<bean class="org.apache.directory.server.core.schema.bootstrap.JavaSchema"/>
<bean class="org.apache.directory.server.core.schema.bootstrap.Krb5kdcSchema"/>
<bean class="org.apache.directory.server.core.schema.bootstrap.SystemSchema"/>
- <bean class="org.safehaus.triplesec.store.schema.SafehausSchema"/>
+ <bean class="org.apache.directory.triplesec.store.schema.SafehausSchema"/>
</set>
</property>
@@ -203,7 +203,7 @@
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name"><value>policyProtectionService</value></property>
<property name="interceptor">
- <bean class="org.safehaus.triplesec.store.interceptor.PolicyProtectionInterceptor" />
+ <bean class="org.apache.directory.triplesec.store.interceptor.PolicyProtectionInterceptor" />
</property>
</bean>
</list>
Copied: directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/LoggingHotpMonitor.java (from r491260, directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/LoggingHotpMonitor.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/LoggingHotpMonitor.java?view=diff&rev=491261&p1=directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/LoggingHotpMonitor.java&r1=491260&p2=directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/LoggingHotpMonitor.java&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/LoggingHotpMonitor.java (original)
+++ directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/LoggingHotpMonitor.java Sat Dec 30 10:00:46 2006
@@ -17,12 +17,12 @@
* under the License.
*
*/
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.safehaus.triplesec.verifier.hotp.HotpMonitor;
+import org.apache.directory.triplesec.verifier.hotp.HotpMonitor;
import org.safehaus.profile.ServerProfile;
import org.safehaus.otp.ResynchParameters;
Copied: directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/LoggingStoreMonitor.java (from r491260, directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/LoggingStoreMonitor.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/LoggingStoreMonitor.java?view=diff&rev=491261&p1=directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/LoggingStoreMonitor.java&r1=491260&p2=directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/LoggingStoreMonitor.java&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/LoggingStoreMonitor.java (original)
+++ directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/LoggingStoreMonitor.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
import javax.naming.directory.Attributes;
@@ -26,8 +26,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.store.ServerProfileStore;
-import org.safehaus.triplesec.store.StoreMonitorAdapter;
+import org.apache.directory.triplesec.store.ServerProfileStore;
+import org.apache.directory.triplesec.store.StoreMonitorAdapter;
/**
@@ -104,7 +104,7 @@
{
if ( log.isDebugEnabled() )
{
- log.debug( "store deleted profile " + profile.getUserId() + " from realm " + profile.getRealm() );
+ log.debug( "store deleted profile " + profile.getUserId() + " from realm " + profile.getProfileId() );
}
}
@@ -113,7 +113,7 @@
{
if ( log.isDebugEnabled() )
{
- log.debug( "store accessed profile " + profile.getUserId() + " in realm " + profile.getRealm() );
+ log.debug( "store accessed profile " + profile.getUserId() + " in realm " + profile.getProfileId() );
}
}
@@ -122,7 +122,7 @@
{
String report = getModificationReport( mods );
- log.info( "store updated profile " + profile.getUserId() + " in realm " + profile.getRealm() + ": " + report );
+ log.info( "store updated profile " + profile.getUserId() + " in realm " + profile.getProfileId() + ": " + report );
}
Copied: directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/Service.java (from r491260, directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/Service.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/Service.java?view=diff&rev=491261&p1=directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/Service.java&r1=491260&p2=directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/Service.java&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/Service.java (original)
+++ directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/Service.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
import java.io.File;
@@ -45,9 +45,9 @@
import org.safehaus.profile.BaseServerProfileModifier;
import org.safehaus.profile.ProfileTestData;
import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
-import org.safehaus.triplesec.store.DefaultServerProfileStore;
-import org.safehaus.triplesec.store.ServerProfileStore;
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
+import org.apache.directory.triplesec.store.DefaultServerProfileStore;
+import org.apache.directory.triplesec.store.ServerProfileStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplesecInstallationLayout.java (from r491260, directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/TriplesecInstallationLayout.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplesecInstallationLayout.java?view=diff&rev=491261&p1=directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/TriplesecInstallationLayout.java&r1=491260&p2=directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplesecInstallationLayout.java&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/TriplesecInstallationLayout.java (original)
+++ directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplesecInstallationLayout.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
import java.io.File;
Copied: directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplesecUberjarMain.java (from r491260, directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/TriplesecUberjarMain.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplesecUberjarMain.java?view=diff&rev=491261&p1=directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/TriplesecUberjarMain.java&r1=491260&p2=directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplesecUberjarMain.java&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/TriplesecUberjarMain.java (original)
+++ directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplesecUberjarMain.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
import java.io.File;
Copied: directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplsecContextFactory.java (from r491260, directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/TriplsecContextFactory.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplsecContextFactory.java?view=diff&rev=491261&p1=directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/TriplsecContextFactory.java&r1=491260&p2=directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplsecContextFactory.java&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/main/src/main/java/org/safehaus/triplesec/TriplsecContextFactory.java (original)
+++ directory/sandbox/triplesec-jacc/main/src/main/java/org/apache/directory/triplesec/TriplsecContextFactory.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
import org.apache.directory.server.jndi.ServerContextFactory;
Modified: directory/sandbox/triplesec-jacc/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/pom.xml Sat Dec 30 10:00:46 2006
@@ -585,7 +585,7 @@
<exclude name="directory"/>
</dirset>
</sourcepath>
- <package name="org.safehaus.triplesec.*"/>
+ <package name="org.apache.directory.triplesec.*"/>
</javadoc>
</tasks>
</configuration>
Modified: directory/sandbox/triplesec-jacc/store/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/store/pom.xml Sat Dec 30 10:00:46 2006
@@ -83,7 +83,7 @@
<schemas>
<schema>
<name>safehaus</name>
- <pkg>org.safehaus.triplesec.store.schema</pkg>
+ <pkg>org.apache.directory.triplesec.store.schema</pkg>
<dependencies>
<dependency>system</dependency>
<dependency>core</dependency>
Modified: directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
import java.util.ArrayList;
@@ -168,7 +168,7 @@
public void delete( KerberosPrincipal principal ) throws NamingException
{
- String msg = "delete in org.safehaus.triplesec.store.DefaultServerProfileStore not implemented!";
+ String msg = "delete in org.apache.directory.triplesec.store.DefaultServerProfileStore not implemented!";
throw new NotImplementedException( msg );
}
Modified: directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
import java.util.Hashtable;
Modified: directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
import java.util.Hashtable;
Modified: directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ServerProfileStore.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ServerProfileStore.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ServerProfileStore.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/ServerProfileStore.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
import javax.naming.NamingException;
Modified: directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitor.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitor.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitor.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
import javax.security.auth.kerberos.KerberosPrincipal;
@@ -25,7 +25,7 @@
import javax.naming.directory.Attributes;
import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.store.ServerProfileStore;
+import org.apache.directory.triplesec.store.ServerProfileStore;
/**
Modified: directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitorAdapter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitorAdapter.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitorAdapter.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitorAdapter.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
import javax.security.auth.kerberos.KerberosPrincipal;
@@ -25,8 +25,8 @@
import javax.naming.directory.Attributes;
import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.store.ServerProfileStore;
-import org.safehaus.triplesec.store.StoreMonitor;
+import org.apache.directory.triplesec.store.ServerProfileStore;
+import org.apache.directory.triplesec.store.StoreMonitor;
/**
Modified: directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store.interceptor;
+package org.apache.directory.triplesec.store.interceptor;
import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
Modified: directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store.interceptor;
+package org.apache.directory.triplesec.store.interceptor;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
Modified: directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
import javax.naming.directory.Attributes;
@@ -32,7 +32,7 @@
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.safehaus.profile.ServerProfile;
import org.safehaus.profile.BaseServerProfileModifier;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
import java.util.Set;
import java.util.HashSet;
Modified: directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
import java.io.File;
@@ -49,7 +49,7 @@
import org.safehaus.profile.BaseServerProfileModifier;
import org.safehaus.profile.ProfileTestData;
import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
import junit.framework.TestCase;
Modified: directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/interceptor/ApplicationACIManagerITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/interceptor/ApplicationACIManagerITest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/interceptor/ApplicationACIManagerITest.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/interceptor/ApplicationACIManagerITest.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store.interceptor;
+package org.apache.directory.triplesec.store.interceptor;
import java.util.Hashtable;
@@ -44,9 +44,9 @@
import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.safehaus.triplesec.store.ProfileObjectFactory;
-import org.safehaus.triplesec.store.ProfileStateFactory;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.store.ProfileObjectFactory;
+import org.apache.directory.triplesec.store.ProfileStateFactory;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
/**
Modified: directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java (original)
+++ directory/sandbox/triplesec-jacc/store/src/test/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.store.interceptor;
+package org.apache.directory.triplesec.store.interceptor;
import java.util.Hashtable;
@@ -45,9 +45,9 @@
import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
import org.apache.directory.server.core.configuration.MutableInterceptorConfiguration;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
-import org.safehaus.triplesec.store.ProfileObjectFactory;
-import org.safehaus.triplesec.store.ProfileStateFactory;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.store.ProfileObjectFactory;
+import org.apache.directory.triplesec.store.ProfileStateFactory;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
/**
@@ -59,7 +59,7 @@
public class PolicyProtectionInterceptorITest extends AbstractAdminTestCase
{
- private static final String STRING_PERMISSION_CLASS_NAME = "org.safehaus.triplesec.guardian.StringPermission";
+ private static final String STRING_PERMISSION_CLASS_NAME = "org.apache.directory.triplesec.guardian.StringPermission";
private DirContext ctx;
@@ -365,8 +365,8 @@
// }
// Test deleting roles in use
- ctx.unbind("grant=mockPerm0, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com");
- ctx.unbind("permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com");
+ ctx.unbind("grant=mockPerm0, permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com");
+ ctx.unbind("permClassName=org.apache.directory.triplesec.guardian.StringPermission, roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com");
try
{
ctx.unbind( "roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example,dc=com" );
Modified: directory/sandbox/triplesec-jacc/swing-admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/pom.xml Sat Dec 30 10:00:46 2006
@@ -97,7 +97,7 @@
<archive>
<manifestFile>src/main/manifest/MANIFEST.MF</manifestFile>
<manifest>
- <mainClass>org.safehaus.triplesec.admin.swing.AdminFrame</mainClass>
+ <mainClass>org.apache.directory.triplesec.admin.swing.AdminFrame</mainClass>
</manifest>
</archive>
</configuration>
@@ -150,7 +150,7 @@
<value>${basedir}/target/settingsFile</value>
</property>
<property>
- <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+ <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
<value>${basedir}/src/test/resources</value>
</property>
</systemProperties>
@@ -179,7 +179,7 @@
</argLine>
<systemProperties>
<property>
- <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+ <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
<value>${basedir}/src/test/resources</value>
</property>
<property>
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
import java.awt.BorderLayout;
@@ -44,15 +44,14 @@
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
-import org.safehaus.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.PermissionClass;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.User;
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.TriplesecInstallationLayout;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.User;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -976,7 +975,7 @@
try
{
- Class.forName( "org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver" );
+ Class.forName( "org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver" );
}
catch ( ClassNotFoundException e1 )
{
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminToolSettings.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminToolSettings.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminToolSettings.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminToolSettings.java Sat Dec 30 10:00:46 2006
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
-import org.safehaus.triplesec.configuration.SmsConfiguration;
-import org.safehaus.triplesec.configuration.SmtpConfiguration;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
public class AdminToolSettings
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
import javax.swing.JPanel;
@@ -38,9 +38,9 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.ApplicationModifier;
-import org.safehaus.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.ApplicationModifier;
+import org.apache.directory.triplesec.admin.DataAccessException;
import javax.swing.JPasswordField;
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/Carrier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/Carrier.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/Carrier.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/Carrier.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
public class Carrier
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
import java.awt.BorderLayout;
@@ -36,8 +36,8 @@
import javax.swing.JProgressBar;
import javax.swing.filechooser.FileFilter;
-import org.safehaus.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
+import org.apache.directory.triplesec.TriplesecInstallationLayout;
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionDialog.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionDialog.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionDialog.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionDialog.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
import javax.swing.JPanel;
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfo.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfo.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfo.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
import org.apache.directory.shared.ldap.util.NamespaceTools;
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfoModifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfoModifier.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfoModifier.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfoModifier.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionManager.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionManager.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionManager.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
import java.io.IOException;
@@ -35,17 +35,16 @@
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.admin.dao.DaoFactory;
-import org.safehaus.triplesec.admin.dao.ldap.LdapDaoFactory;
-import org.safehaus.triplesec.configuration.TriplesecStartupConfiguration;
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.jaas.PasscodeCallback;
-import org.safehaus.triplesec.jaas.PolicyCallback;
-import org.safehaus.triplesec.jaas.RealmCallback;
-import org.safehaus.triplesec.jaas.SafehausLoginModule;
-import org.safehaus.triplesec.jaas.SafehausPrincipal;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.dao.DaoFactory;
+import org.apache.directory.triplesec.admin.dao.ldap.LdapDaoFactory;
+import org.apache.directory.triplesec.configuration.TriplesecStartupConfiguration;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.jaas.PasscodeCallback;
+import org.apache.directory.triplesec.jaas.PolicyCallback;
+import org.apache.directory.triplesec.jaas.RealmCallback;
+import org.apache.directory.triplesec.jaas.SafehausLoginModule;
+import org.apache.directory.triplesec.jaas.SafehausPrincipal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ExternalLinkPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ExternalLinkPanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ExternalLinkPanel.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ExternalLinkPanel.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
import java.awt.BorderLayout;
@@ -33,8 +33,8 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
-import org.safehaus.triplesec.admin.ExternalUser;
-import org.safehaus.triplesec.admin.ExternalUserModifier;
+import org.apache.directory.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.ExternalUserModifier;
public class ExternalLinkPanel extends JPanel implements StatusObject, KeyListener, FocusListener
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GeneralPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GeneralPanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GeneralPanel.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GeneralPanel.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
import java.awt.GridBagConstraints;
@@ -27,7 +27,7 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
-import org.safehaus.triplesec.admin.AdministeredEntity;
+import org.apache.directory.triplesec.admin.AdministeredEntity;
public class GeneralPanel extends JPanel
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
import javax.swing.JPanel;
@@ -39,9 +39,9 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.GroupModifier;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.GroupModifier;
public class GroupPanel extends JPanel
Modified: directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java (original)
+++ directory/sandbox/triplesec-jacc/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
import java.awt.BorderLayout;
@@ -35,7 +35,7 @@
import javax.swing.JScrollPane;
import javax.swing.tree.DefaultMutableTreeNode;
-import org.safehaus.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.User;
public class GroupUsersPanel extends JPanel