directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r564813 [1/2] - in /directory/sandbox/djencks/triplesec-jacc2: ./ admin-api2/src/main/java/org/apache/directory/triplesec/admin/ configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ configuration-io/src/test/resource...
Date Sat, 11 Aug 2007 00:47:27 GMT
Author: djencks
Date: Fri Aug 10 17:47:23 2007
New Revision: 564813

URL: http://svn.apache.org/viewvc?view=rev&rev=564813
Log:
change constant names safehaus to triplesec

Modified:
    directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Constants.java
    directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Profile.java
    directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java
    directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/User.java
    directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java
    directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java
    directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValue.xml
    directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValueInitial.xml
    directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValue.xml
    directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValueInitial.xml
    directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/EntryApplicationPolicy.java
    directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/Profile.java
    directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.ldif
    directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml
    directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml
    directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java
    directory/sandbox/djencks/triplesec-jacc2/pom.xml
    directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java
    directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java
    directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java
    directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java
    directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java
    directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java
    directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java
    directory/sandbox/djencks/triplesec-jacc2/store/src/test/resources/safehaus.ldif
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeCellRenderer.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewApplicationPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewGroupPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewPermissionPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewProfilePanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewRolePanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewUserPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/PermissionPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfilePanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfilePermissionsPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfileRolesPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/RoleGrantsPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/RolePanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/SplashScreen.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/UserNorthPanel.java
    directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/test/java/org/apache/directory/triplesec/admin/swing/SettingsUtilsTest.java
    directory/sandbox/djencks/triplesec-jacc2/swing-demo/src/main/java/org/apache/directory/triplesec/guardian/demo/LoginCommand.java
    directory/sandbox/djencks/triplesec-jacc2/tools/src/main/java/org/apache/directory/triplesec/tools/Tools.java
    directory/sandbox/djencks/triplesec-jacc2/tools/src/main/resources/org/safehaus/triplesec/tools/product.properties
    directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/DefaultHotpSamVerifier.java
    directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/GenerateHotp.java
    directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/HotpSamVerifierITest.java
    directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/resources/safehaus.ldif
    directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivateAccountFilter.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/webapp/HausKeys.jad
    directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/webapp/WEB-INF/web.xml
    directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/webapp/index.jsp
    directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/webapp/success.jsp
    directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/test/org/safehaus/triplesec/activation/ActivationUtilsTest.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/model/TriplesecConfigSettings.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigTool.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/resources/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.html
    directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/resources/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.html
    directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/resources/applicationContext.xml
    directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/resources/org/apache/directory/triplesec/demo/view/borders/PageBorder.html
    directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/resources/org/apache/directory/triplesec/demo/view/pages/AdminPage.html
    directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/resources/org/apache/directory/triplesec/demo/view/pages/ChartPage.html
    directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/resources/org/apache/directory/triplesec/demo/view/pages/HomePage.html
    directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/resources/org/apache/directory/triplesec/demo/view/pages/WapPushPage.html
    directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/webapp/WEB-INF/99demo.ldif
    directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/resources/org/apache/directory/triplesec/registration/view/borders/AppPageBorder.html
    directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/resources/org/apache/directory/triplesec/registration/view/borders/WizardPanelBorder.html
    directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/webapp/WEB-INF/web.xml
    directory/sandbox/djencks/triplesec-jacc2/webapp-servlet-demo/src/main/java/org/apache/directory/triplesec/demo/LoginCommand.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-servlet-demo/src/test/org/safehaus/demo/DerbyInvestmentsTest.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-servlet-demo/src/test/org/safehaus/demo/JaasTest.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/HomePage.java
    directory/sandbox/djencks/triplesec-jacc2/webapp-wicket-admin/src/main/resources/org/apache/directory/triplesec/adminui/view/borders/PageBorder.html

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Constants.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Constants.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Constants.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Constants.java Fri Aug 10 17:47:23 2007
@@ -29,7 +29,7 @@
     String POLICY_PROFILE_OC = "policyProfile";
     String POLICY_PERMISSION_OC = "policyPermission";
     String POLICY_ROLE_OC = "policyRole";
-    String SAFEHAUS_PROFILE_OC = "safehausProfile";
+    String triplesec_PROFILE_OC = "triplesecProfile";
     String GROUP_OF_UNIQUE_NAMES_OC = "groupOfUniqueNames";
     String UID_OBJECT_OC = "uidObject";
     String EXTENSIBLE_OBJECT_OC = "extensibleObject";
@@ -41,8 +41,8 @@
     String REFERRAL_OC = "referral";
     String POLICY_JAVA_PERMISSION_OC = "javaPermission";
     
-    String SAFEHAUS_RESYNCH_COUNT_ID = "safehausResynchCount";
-    String SAFEHAUS_DISABLED_ID = "safehausDisabled";
+    String triplesec_RESYNCH_COUNT_ID = "triplesecResynchCount";
+    String triplesec_DISABLED_ID = "triplesecDisabled";
     String KRB5_DISABLED_ID = "krb5AccountDisabled";
     String KRB5ENCRYPTION_TYPE_ID = "krb5EncryptionType";
     String KRB5KEY_VERSION_NUMBER_ID = "krb5KeyVersionNumber";
@@ -66,16 +66,16 @@
     String DESCRIPTION_ID = "description";
     String MOBILE_ID = "mobile";
     String EMAIL_ID = "mail";
-    String NOTIFY_BY_ID = "safehausNotifyBy";
-    String MOBILE_CARRIER_ID = "safehausMobileCarrier";
-    String TOKEN_PIN_ID = "safehausTokenPin";
-    String MIDLE_NAME_ID = "safehausMidletName";
-    String FAILURES_IN_EPOCH_ID = "safehausFailuresInEpoch";
-    String ACTIVATION_KEY_ID = "safehausActivationKey";
-    String REALM_ID = "safehausRealm";
-    String SECRET_ID = "safehausSecret";
-    String LABEL_ID = "safehausLabel";
-    String MOVING_FACTOR_ID = "safehausFactor";
+    String NOTIFY_BY_ID = "triplesecNotifyBy";
+    String MOBILE_CARRIER_ID = "triplesecMobileCarrier";
+    String TOKEN_PIN_ID = "triplesecTokenPin";
+    String MIDLE_NAME_ID = "triplesecMidletName";
+    String FAILURES_IN_EPOCH_ID = "triplesecFailuresInEpoch";
+    String ACTIVATION_KEY_ID = "triplesecActivationKey";
+    String REALM_ID = "triplesecRealm";
+    String SECRET_ID = "triplesecSecret";
+    String LABEL_ID = "triplesecLabel";
+    String MOVING_FACTOR_ID = "triplesecFactor";
     String UNIQUE_MEMBER_ID = "uniqueMember";
     String REF_ID = "ref";
     String GRANTS_ID = "grants";
@@ -90,7 +90,7 @@
     String PERM_NAME_ID = "permName";
     String ROLE_NAME_ID = "roleName";
     String PROFILEID_ID = "profileId";
-    String SAFEHAUS_ID = "safehausUid";
+    String triplesec_ID = "triplesecUid";
     String CREATORS_NAME_ID = "creatorsName";
 
     String PERM_JAVA_CLASS_ID = "permJavaClass";

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Profile.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Profile.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Profile.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Profile.java Fri Aug 10 17:47:23 2007
@@ -41,7 +41,7 @@
             Constants.ROLES_ID,
             Constants.GRANTS_ID,
             Constants.DENIALS_ID,
-            Constants.SAFEHAUS_DISABLED_ID,
+            Constants.triplesec_DISABLED_ID,
             Constants.USER_ID};
 
     private static final int PROFILEID_INDEX = 0;
@@ -62,7 +62,7 @@
         stateManager.addField( new ReferenceMapField<Role>( Constants.ROLES_ID ) );
         stateManager.addField( new ReferenceMapField<Permission>( Constants.GRANTS_ID ) );
         stateManager.addField( new ReferenceMapField<Permission>( Constants.DENIALS_ID ) );
-        stateManager.addField( new SingleValuedField<Boolean>( Constants.SAFEHAUS_DISABLED_ID, null ) );
+        stateManager.addField( new SingleValuedField<Boolean>( Constants.triplesec_DISABLED_ID, null ) );
         stateManager.addField( new SingleValuedField<String>( Constants.USER_ID, null ) );
 
         stateManager.setState( State.EMPTY );

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java Fri Aug 10 17:47:23 2007
@@ -69,10 +69,10 @@
         groupQuery = ( Query<Group> ) entityManager.createQuery( "ou=Groups", Group.class, "(& (cn=:groupId) (objectClass=groupOfUniqueNames))");
         //TODO figure out how to query for multiple object classes
         externalUserQuery = ( Query<ExternalUser> ) entityManager.createQuery( "ou=Users", ExternalUser.class, "(& (uid=:uid) (objectClass=referral))");
-        hauskeysUserQuery = ( Query<HauskeysUser> ) entityManager.createQuery( "ou=Users", HauskeysUser.class, "(& (uid=:uid) (objectClass=safehausProfile))");
+        hauskeysUserQuery = ( Query<HauskeysUser> ) entityManager.createQuery( "ou=Users", HauskeysUser.class, "(& (uid=:uid) (objectClass=triplesecProfile))");
         localUserQuery = ( Query<LocalUser> ) entityManager.createQuery( "ou=Users", LocalUser.class, "(& (uid=:uid) (objectClass=krb5Principal))");
         userQuery = ( Query<User> ) entityManager.createQuery( "ou=Users", User.class, "(& (uid=:uid) (| (objectClass=referral) (objectClass=person) ))");
-        userByActivationKey = ( Query<User> ) entityManager.createQuery( "ou=Users", User.class, "(& (safehausActivationKey=:activationKey) (| (objectClass=referral) (objectClass=person) ))");
+        userByActivationKey = ( Query<User> ) entityManager.createQuery( "ou=Users", User.class, "(& (triplesecActivationKey=:activationKey) (| (objectClass=referral) (objectClass=person) ))");
     }
 
     /**

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/User.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/User.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/User.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/User.java Fri Aug 10 17:47:23 2007
@@ -34,7 +34,7 @@
 {
     public static final String[] attrs = new String[] {"uid",
             Constants.DESCRIPTION_ID, null,
-            Constants.SAFEHAUS_DISABLED_ID};
+            Constants.triplesec_DISABLED_ID};
 
     protected static final int ID_INDEX = 0;
     protected static final int DESCRIPTION_INDEX = 1;
@@ -47,7 +47,7 @@
         this.stateManager = stateManager;
         stateManager.setRdn( new SimpleRdn( "uid", null, "ou=users" ) );
         stateManager.addField( new SingleValuedField<String>( Constants.DESCRIPTION_ID, null ) );
-        stateManager.addField( new SingleValuedField<Boolean>( Constants.SAFEHAUS_DISABLED_ID, null ) );
+        stateManager.addField( new SingleValuedField<Boolean>( Constants.triplesec_DISABLED_ID, null ) );
 
         stateManager.setState( State.EMPTY );
     }

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java Fri Aug 10 17:47:23 2007
@@ -307,8 +307,8 @@
         props.put( "kdc.tgs.proxiable.allowed", "true" );
         props.put( "kdc.tgs.postdate.allowed", "true" );
         props.put( "kdc.tgs.renewable.allowed", "true" );
-        props.put( "safehaus.entry.basedn", "ou=Users,dc=example,dc=com" );
-        props.put( "safehaus.load.testdata", "true" );
+        props.put( "triplesec.entry.basedn", "ou=Users,dc=example,dc=com" );
+        props.put( "triplesec.load.testdata", "true" );
         props.put( "kerberos.sam.type.7", "org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier" );
         ServerXmlUtils.writeConfiguration( outputFile, configuration, props );
     }

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java Fri Aug 10 17:47:23 2007
@@ -24,6 +24,10 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.FileReader;
+import java.io.Reader;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
 import java.net.URL;
 
 import org.apache.commons.io.FileUtils;
@@ -155,13 +159,14 @@
 
     private void checkFile( URL expected, File generated ) throws IOException
     {
-        InputStream generatedIn = new FileInputStream( generated );
-        InputStream expectedIn = expected.openStream();
-        while ( generatedIn.available() > 0 )
-        {
-            int generatedByte = generatedIn.read();
-            int expectedByte = expectedIn.read();
-            assertEquals( generatedByte, expectedByte );
+        LineNumberReader generatedIn = new LineNumberReader(new FileReader( generated ));
+
+        LineNumberReader expectedIn = new LineNumberReader(new InputStreamReader(expected.openStream()));
+        while (generatedIn.ready() )
+        {
+            String generatedLine = generatedIn.readLine();
+            String expectedLine = expectedIn.readLine();
+            assertEquals("expected: " + expectedLine + " got: " + generatedLine, generatedLine.trim(), expectedLine.trim() );
         }
         expectedIn.close();
         generatedIn.close();

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValue.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValue.xml?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValue.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValue.xml Fri Aug 10 17:47:23 2007
@@ -27,7 +27,7 @@
     </init-param>  
     <init-param> 
       <param-name>smtpFrom</param-name>  
-      <param-value>dev@safehaus.org</param-value> 
+      <param-value>dev@triplesec.org</param-value>
     </init-param>  
     <!-- 
       <init-param>
@@ -79,7 +79,7 @@
     <!-- 
       <init-param>
         <param-name>midletNameAttribute</param-name>
-        <param-value>safehausMidletName</param-value>
+        <param-value>triplesecMidletName</param-value>
       </init-param>
       -->  
     <!-- Uncomment this to override cleanup time for sweeper; this will be deprecated   -->  

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValueInitial.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValueInitial.xml?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValueInitial.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValueInitial.xml Fri Aug 10 17:47:23 2007
@@ -27,7 +27,7 @@
     </init-param>  
     <init-param> 
       <param-name>smtpFrom</param-name>  
-      <param-value>dev@safehaus.org</param-value> 
+      <param-value>dev@triplesec.org</param-value>
     </init-param>  
     <!-- 
       <init-param>
@@ -79,7 +79,7 @@
     <!-- 
       <init-param>
         <param-name>midletNameAttribute</param-name>
-        <param-value>safehausMidletName</param-value>
+        <param-value>triplesecMidletName</param-value>
       </init-param>
       -->  
     <!-- Uncomment this to override cleanup time for sweeper; this will be deprecated   -->  

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValue.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValue.xml?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValue.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValue.xml Fri Aug 10 17:47:23 2007
@@ -27,7 +27,7 @@
     </init-param>  
     <init-param> 
       <param-name>smtpFrom</param-name>  
-      <param-value>dev@safehaus.org</param-value> 
+      <param-value>dev@triplesec.org</param-value>
     </init-param>  
     <!-- 
       <init-param>
@@ -79,7 +79,7 @@
     <!-- 
       <init-param>
         <param-name>midletNameAttribute</param-name>
-        <param-value>safehausMidletName</param-value>
+        <param-value>triplesecMidletName</param-value>
       </init-param>
       -->  
     <!-- Uncomment this to override cleanup time for sweeper; this will be deprecated   -->  

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValueInitial.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValueInitial.xml?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValueInitial.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValueInitial.xml Fri Aug 10 17:47:23 2007
@@ -27,7 +27,7 @@
     </init-param>  
     <init-param> 
       <param-name>smtpFrom</param-name>  
-      <param-value>dev@safehaus.org</param-value> 
+      <param-value>dev@triplesec.org</param-value>
     </init-param>  
     <!-- 
       <init-param>
@@ -79,7 +79,7 @@
     <!-- 
       <init-param>
         <param-name>midletNameAttribute</param-name>
-        <param-value>safehausMidletName</param-value>
+        <param-value>triplesecMidletName</param-value>
       </init-param>
       -->  
     <!-- Uncomment this to override cleanup time for sweeper; this will be deprecated   -->  

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/EntryApplicationPolicy.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/EntryApplicationPolicy.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/EntryApplicationPolicy.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/EntryApplicationPolicy.java Fri Aug 10 17:47:23 2007
@@ -35,7 +35,7 @@
 import javax.naming.NamingEnumeration;
 
 /**
- * @version $Rev$ $Date$
+ * @version $Rev:564501 $ $Date:2007-08-10 00:58:38 -0700 (Fri, 10 Aug 2007) $
  */
 public abstract class EntryApplicationPolicy implements ApplicationPolicy {
     /** the name of the application this store is associated with */
@@ -210,7 +210,7 @@
             userName = ( String ) userAttr.get();
         }
 
-        Attribute disabledAttr = attrs.get( "safehausDisabled" );
+        Attribute disabledAttr = attrs.get( "triplesecDisabled" );
         if ( disabledAttr != null )
         {
             disabled = parseBoolean( ( ( String ) disabledAttr.get() ).toLowerCase() );

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/Profile.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/Profile.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/Profile.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/Profile.java Fri Aug 10 17:47:23 2007
@@ -51,7 +51,7 @@
  * take precedence.  For more information take a look at the documentation here:
  * </p>
  * <ul>
- *   <li><a href="http://guardian.safehaus.org/User%27s+Guide">Guardian User's Guide</a></li>
+ *   <li><a href="http://guardian.triplesec.org/User%27s+Guide">Guardian User's Guide</a></li>
  * </ul>
  *
  * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>

Modified: directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.ldif?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.ldif (original)
+++ directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.ldif Fri Aug 10 17:47:23 2007
@@ -172,7 +172,7 @@
 objectclass: inetOrgPerson
 objectclass: krb5Principal
 objectclass: krb5KDCEntry
-objectclass: safehausProfile
+objectclass: triplesecProfile
 ou: Directory
 ou: Users
 l: Jacksonville
@@ -184,16 +184,16 @@
 facsimiletelephonenumber: +1 904 982 6883
 roomnumber: 666
 apacheSamType: 7
-safehausUid: akarasulu
-safehausRealm: EXAMPLE.COM
-safehausLabel: example realm
-safehausFactor: 27304238
-safehausSecret:: aaaabbbbccccdddd
-safehausFailuresInEpoch: 0
-safehausResynchCount: -1
-safehausInfo: test account
-safehausTokenPin: 1234
-safehausNotifyBy: sms
+triplesecUid: akarasulu
+triplesecRealm: EXAMPLE.COM
+triplesecLabel: example realm
+triplesecFactor: 27304238
+triplesecSecret:: aaaabbbbccccdddd
+triplesecFailuresInEpoch: 0
+triplesecResynchCount: -1
+triplesecInfo: test account
+triplesecTokenPin: 1234
+triplesecNotifyBy: sms
 userpassword: maxwell
 
 dn: uid=lockedout, ou=Users, dc=example,dc=com
@@ -207,7 +207,7 @@
 objectclass: inetOrgPerson
 objectclass: krb5Principal
 objectclass: krb5KDCEntry
-objectclass: safehausProfile
+objectclass: triplesecProfile
 ou: Directory
 ou: Users
 l: DummyCity
@@ -218,16 +218,16 @@
 telephonenumber: +1 904 982 6882
 facsimiletelephonenumber: +1 904 982 6883
 roomnumber: 699
-safehausUid: lockedout
-safehausRealm: EXAMPLE.COM
-safehausLabel: example realm
-safehausFactor: 101347012
-safehausSecret:: (Q-H23BQ#SDsdkf3o&81923r
-safehausFailuresInEpoch: 20
-safehausResynchCount: -1
-safehausInfo: unlucky account
-safehausTokenPin: 1234
-safehausNotifyBy: sms
+triplesecUid: lockedout
+triplesecRealm: EXAMPLE.COM
+triplesecLabel: example realm
+triplesecFactor: 101347012
+triplesecSecret:: (Q-H23BQ#SDsdkf3o&81923r
+triplesecFailuresInEpoch: 20
+triplesecResynchCount: -1
+triplesecInfo: unlucky account
+triplesecTokenPin: 1234
+triplesecNotifyBy: sms
 userpassword: asdfasdf
 
 dn: uid=erodriguez, ou=Users, dc=example,dc=com
@@ -241,7 +241,7 @@
 objectclass: inetOrgPerson
 objectclass: krb5Principal
 objectclass: krb5KDCEntry
-objectclass: safehausProfile
+objectclass: triplesecProfile
 ou: Directory
 ou: Users
 l: Boston
@@ -252,16 +252,16 @@
 telephonenumber: +1 408 555 9187
 facsimiletelephonenumber: +1 408 555 8473
 roomnumber: 667
-safehausUid: erodriguez
-safehausRealm: EXAMPLE.COM
-safehausLabel: example realm
-safehausFactor: 917483720127847
-safehausSecret:: xcJqp45S80e8fahs&@rq1I98awg8)^*
-safehausFailuresInEpoch: 0
-safehausResynchCount: -1
-safehausInfo: test account
-safehausTokenPin: 1234
-safehausNotifyBy: sms
+triplesecUid: erodriguez
+triplesecRealm: EXAMPLE.COM
+triplesecLabel: example realm
+triplesecFactor: 917483720127847
+triplesecSecret:: xcJqp45S80e8fahs&@rq1I98awg8)^*
+triplesecFailuresInEpoch: 0
+triplesecResynchCount: -1
+triplesecInfo: test account
+triplesecTokenPin: 1234
+triplesecNotifyBy: sms
 userpassword: noices
 
 dn: uid=krbtgt, ou=Users, dc=example,dc=com

Modified: directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml Fri Aug 10 17:47:23 2007
@@ -502,8 +502,8 @@
         <prop key="kdc.tgs.postdate.allowed">true</prop>
         <prop key="kdc.tgs.renewable.allowed">true</prop>
 
-        <prop key="safehaus.entry.basedn">ou=Users,dc=example,dc=com</prop>
-        <prop key="safehaus.load.testdata">true</prop>
+        <prop key="triplesec.entry.basedn">ou=Users,dc=example,dc=com</prop>
+        <prop key="triplesec.load.testdata">true</prop>
         <prop key="kerberos.sam.type.7">org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
       </props>
     </property>
@@ -564,7 +564,7 @@
         <property name="smtpAuthenticate"><value>false</value></property>
              <property name="smtpHost"><value>localhost</value></property>
              <property name="smtpSubject"><value>Triplesec Account Activated</value></property>
-             <property name="smtpFrom"><value>dev@safehaus.org</value></property>
+             <property name="smtpFrom"><value>dev@triplesec.org</value></property>
            </bean>  
          </property>    
          
@@ -585,7 +585,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.apache.directory.triplesec.store.schema.SafehausSchema"/>
+        <bean class="org.apache.directory.triplesec.store.schema.triplesecSchema"/>
       </set>
     </property>
 - ->

Modified: directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml Fri Aug 10 17:47:23 2007
@@ -35,8 +35,8 @@
         <prop key="kdc.tgs.postdate.allowed">true</prop>
         <prop key="kdc.tgs.renewable.allowed">true</prop>
 
-        <prop key="safehaus.entry.basedn">ou=Users,dc=example,dc=com</prop>
-        <prop key="safehaus.load.testdata">true</prop>
+        <prop key="triplesec.entry.basedn">ou=Users,dc=example,dc=com</prop>
+        <prop key="triplesec.load.testdata">true</prop>
         <prop key="kerberos.sam.type.7">org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
       </props>
     </property>
@@ -101,7 +101,7 @@
              -->
              <property name="smtpHost"><value>localhost</value></property>
              <property name="smtpSubject"><value>Triplesec Account Activated</value></property>
-             <property name="smtpFrom"><value>dev@safehaus.org</value></property>
+             <property name="smtpFrom"><value>dev@triplesec.org</value></property>
            </bean>  
          </property>    
          

Modified: directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java Fri Aug 10 17:47:23 2007
@@ -319,7 +319,7 @@
         DirContext userContext = null;
         try
         {
-            LdapDN dn = new LdapDN( env.getProperty( "safehaus.entry.basedn" ) );
+            LdapDN dn = new LdapDN( env.getProperty( "triplesec.entry.basedn" ) );
             dn.remove( dn.size() - 1 );
             env.setProperty( Context.PROVIDER_URL, dn.toString() );
             userContext = new InitialDirContext( env );
@@ -336,7 +336,7 @@
         // setup demo profiles
         try
         {
-            if ( PropertiesUtils.get( env, "safehaus.load.testdata", true ) )
+            if ( PropertiesUtils.get( env, "triplesec.load.testdata", true ) )
             {
                 ServerProfileStore store;
                 store = new DefaultServerProfileStore( ( DirContext ) userContext.lookup( "ou=Users" ) );

Modified: directory/sandbox/djencks/triplesec-jacc2/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/pom.xml?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/pom.xml Fri Aug 10 17:47:23 2007
@@ -369,12 +369,14 @@
     </repository>
   </repositories>
 
+<!--
   <distributionManagement>
     <site>
       <id>triplesec.website</id>
-      <url>scp://safehaus.org/home/projects/triplesec/public_html/maven</url>
+      <url>scp://.org/home/projects/triplesec/public_html/maven</url>
     </site>
   </distributionManagement>
+-->
 
   <issueManagement>
     <system>JIRA</system>

Modified: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java Fri Aug 10 17:47:23 2007
@@ -21,7 +21,7 @@
 
 
 /**
- * The interface for a Safehaus account profile.
+ * The interface for a triplesec account profile.
  *
  * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
  * @version $Rev$

Modified: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java Fri Aug 10 17:47:23 2007
@@ -80,7 +80,7 @@
     String getActivationKey();
     
     /**
-     * Get's the safehausTokenPin value for this account.
+     * Get's the triplesecTokenPin value for this account.
      */
     String getTokenPin();
     

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java Fri Aug 10 17:47:23 2007
@@ -37,7 +37,7 @@
 
 
 /**
- * The default Safehaus store implementation which is backed by the ApacheDS.
+ * The default triplesec store implementation which is backed by the ApacheDS.
  *
  * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
  * @version $Rev$
@@ -48,7 +48,7 @@
     private static final ModificationItem[] EMPTY = new ModificationItem[0];
 
     /** temporary property to lookup alternate monitor */
-    public static final String MONITOR_PROP = "org.safehaus.store.monitor";
+    public static final String MONITOR_PROP = "org.triplesec.store.monitor";
 
     // ------------------------------------------------------------------------
     // Members
@@ -192,58 +192,58 @@
         SearchResult result = getProfileEntry( oldPrincipal );
         Attributes original = result.getAttributes();
 
-        if ( updated.getFactor() != getLong( "safehausFactor", original ) )
+        if ( updated.getFactor() != getLong( "triplesecFactor", original ) )
         {
-            Attribute attr = new AttributeImpl( "safehausFactor" );
+            Attribute attr = new AttributeImpl( "triplesecFactor" );
             attr.add( Long.toString( updated.getFactor() ) );
             list.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr ) );
         }
 
-        if ( updated.getResynchCount() != getInt( "safehausResynchCount", original ) )
+        if ( updated.getResynchCount() != getInt( "triplesecResynchCount", original ) )
         {
-            Attribute attr = new AttributeImpl( "safehausResynchCount" );
+            Attribute attr = new AttributeImpl( "triplesecResynchCount" );
             attr.add( Integer.toString( updated.getResynchCount() ) );
             list.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr ) );
         }
 
-        if ( updated.getFailuresInEpoch() != getInt( "safehausFailuresInEpoch", original ) )
+        if ( updated.getFailuresInEpoch() != getInt( "triplesecFailuresInEpoch", original ) )
         {
-            Attribute attr = new AttributeImpl( "safehausFailuresInEpoch" );
+            Attribute attr = new AttributeImpl( "triplesecFailuresInEpoch" );
             attr.add( Integer.toString( updated.getFailuresInEpoch() ) );
             list.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr ) );
         }
 
-        if ( ! updated.getUserId().equals( getString( "safehausUid", original ) ) )
+        if ( ! updated.getUserId().equals( getString( "triplesecUid", original ) ) )
         {
-            Attribute attr = new AttributeImpl( "safehausUid" );
+            Attribute attr = new AttributeImpl( "triplesecUid" );
             attr.add( updated.getUserId() );
             list.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr ) );
         }
 
-        if ( ! updated.getRealm().equals( getString( "safehausRealm", original ) ) )
+        if ( ! updated.getRealm().equals( getString( "triplesecRealm", original ) ) )
         {
-            Attribute attr = new AttributeImpl( "safehausRealm" );
+            Attribute attr = new AttributeImpl( "triplesecRealm" );
             attr.add( updated.getRealm() );
             list.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr ) );
         }
 
-        if ( ! updated.getLabel().equals( getString( "safehausLabel", original ) ) )
+        if ( ! updated.getLabel().equals( getString( "triplesecLabel", original ) ) )
         {
-            Attribute attr = new AttributeImpl( "safehausLabel" );
+            Attribute attr = new AttributeImpl( "triplesecLabel" );
             attr.add( updated.getLabel() );
             list.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr ) );
         }
 
-        if ( ! updated.getSecret().equals( getString( "safehausSecret", original ) ) )
+        if ( ! updated.getSecret().equals( getString( "triplesecSecret", original ) ) )
         {
-            Attribute attr = new AttributeImpl( "safehausSecret" );
+            Attribute attr = new AttributeImpl( "triplesecSecret" );
             attr.add( updated.getSecret() );
             list.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr ) );
         }
 
-        if ( updated.getInfo() != null && ! updated.getInfo().equals( getString( "safehausInfo", original ) ) )
+        if ( updated.getInfo() != null && ! updated.getInfo().equals( getString( "triplesecInfo", original ) ) )
         {
-            Attribute attr = new AttributeImpl( "safehausInfo" );
+            Attribute attr = new AttributeImpl( "triplesecInfo" );
             attr.add( updated.getInfo() );
             list.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr ) );
         }

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java Fri Aug 10 17:47:23 2007
@@ -54,17 +54,17 @@
     
     public Object getObjectInstance( Object obj, Name name, Context nameCtx, Hashtable environment, Attributes attrs ) throws NamingException
     {
-        if ( attrs == null || attrs.get( "objectClass" ) == null || ! attrs.get( "objectClass" ).contains( "safehausProfile" ) )
+        if ( attrs == null || attrs.get( "objectClass" ) == null || ! attrs.get( "objectClass" ).contains( "triplesecProfile" ) )
         {
             return null;
         }
 
         BaseServerProfileModifier modifier = new BaseServerProfileModifier();
-        modifier.setUserId( ( String ) attrs.get( "safehausUid" ).get() );
-        modifier.setRealm( ( String ) attrs.get( "safehausRealm" ).get() );
-        modifier.setLabel( ( String ) attrs.get( "safehausLabel" ).get() );
-        modifier.setTokenPin( ( String ) attrs.get( "safehausTokenPin" ).get() );
-        modifier.setFactor( Long.parseLong( ( String ) attrs.get( "safehausFactor" ).get() ) );
+        modifier.setUserId( ( String ) attrs.get( "triplesecUid" ).get() );
+        modifier.setRealm( ( String ) attrs.get( "triplesecRealm" ).get() );
+        modifier.setLabel( ( String ) attrs.get( "triplesecLabel" ).get() );
+        modifier.setTokenPin( ( String ) attrs.get( "triplesecTokenPin" ).get() );
+        modifier.setFactor( Long.parseLong( ( String ) attrs.get( "triplesecFactor" ).get() ) );
         
         if ( attrs.get( KerberosAttribute.ACCOUNT_DISABLED ) != null )
         {
@@ -72,7 +72,7 @@
                 attrs.get( KerberosAttribute.ACCOUNT_DISABLED ).get() ).toLowerCase() ) );
         }
 
-        Object secret = attrs.get( "safehausSecret" ).get();
+        Object secret = attrs.get( "triplesecSecret" ).get();
         if ( secret instanceof String )
         {
             modifier.setSecret( StringTools.getBytesUtf8( ( String ) secret ) );
@@ -92,17 +92,17 @@
             modifier.setPassword( ( byte[] ) password );
         }
         
-        modifier.setFailuresInEpoch( Integer.parseInt( ( String ) attrs.get( "safehausFailuresInEpoch" ).get() ) );
-        modifier.setResynchCount( Integer.parseInt( ( String ) attrs.get( "safehausResynchCount" ).get() ) );
+        modifier.setFailuresInEpoch( Integer.parseInt( ( String ) attrs.get( "triplesecFailuresInEpoch" ).get() ) );
+        modifier.setResynchCount( Integer.parseInt( ( String ) attrs.get( "triplesecResynchCount" ).get() ) );
 
-        if ( attrs.get( "safehausInfo" ) != null )
+        if ( attrs.get( "triplesecInfo" ) != null )
         {
-            modifier.setInfo( ( String ) attrs.get( "safehausInfo" ).get() );
+            modifier.setInfo( ( String ) attrs.get( "triplesecInfo" ).get() );
         }
 
-        if ( attrs.get( "safehausActivationKey" ) != null )
+        if ( attrs.get( "triplesecActivationKey" ) != null )
         {
-            modifier.setActivationKey( ( String ) attrs.get( "safehausActivationKey" ).get() );
+            modifier.setActivationKey( ( String ) attrs.get( "triplesecActivationKey" ).get() );
         }
 
         return modifier.getServerProfile();

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java Fri Aug 10 17:47:23 2007
@@ -155,33 +155,33 @@
             outAttrs.put( TYPE_ATTR, Integer.toString( key.getKeyType() ) );
         }
 
-        if ( ! oc.contains( "safehausProfile" ) )
+        if ( ! oc.contains( "triplesecProfile" ) )
         {
-            oc.add( "safehausProfile" );
+            oc.add( "triplesecProfile" );
         }
 
         // process the Profile specific attributes
 
-        outAttrs.put( new AttributeImpl( "safehausUid", p.getUserId() ) );
-        outAttrs.put( new AttributeImpl( "safehausRealm", p.getRealm() ) );
-        outAttrs.put( new AttributeImpl( "safehausFactor", String.valueOf( p.getFactor() ) ) );
-        outAttrs.put( new AttributeImpl( "safehausSecret", p.getSecret() ) );
-        outAttrs.put( new AttributeImpl( "safehausLabel", p.getLabel() ) );
-        outAttrs.put( new AttributeImpl( "safehausTokenPin", p.getTokenPin() ) );
-        outAttrs.put( new AttributeImpl( "safehausNotifyBy", p.getNotifyBy() ) );
+        outAttrs.put( new AttributeImpl( "triplesecUid", p.getUserId() ) );
+        outAttrs.put( new AttributeImpl( "triplesecRealm", p.getRealm() ) );
+        outAttrs.put( new AttributeImpl( "triplesecFactor", String.valueOf( p.getFactor() ) ) );
+        outAttrs.put( new AttributeImpl( "triplesecSecret", p.getSecret() ) );
+        outAttrs.put( new AttributeImpl( "triplesecLabel", p.getLabel() ) );
+        outAttrs.put( new AttributeImpl( "triplesecTokenPin", p.getTokenPin() ) );
+        outAttrs.put( new AttributeImpl( "triplesecNotifyBy", p.getNotifyBy() ) );
         outAttrs.put( new AttributeImpl( KerberosAttribute.ACCOUNT_DISABLED, String.valueOf( p.isDisabled() ).toUpperCase() ) );
         outAttrs.put( new AttributeImpl( "userPassword", p.getPassword() ) );
 
         if ( p.getActivationKey() != null )
         {
-        	outAttrs.put( new AttributeImpl( "safehausActivationKey", p.getActivationKey() ) );
+        	outAttrs.put( new AttributeImpl( "triplesecActivationKey", p.getActivationKey() ) );
         }
         
-        outAttrs.put( new AttributeImpl( "safehausResynchCount", Integer.toString( p.getResynchCount() ) ) );
-        outAttrs.put( new AttributeImpl( "safehausFailuresInEpoch", Integer.toString( p.getFailuresInEpoch() ) ) );
+        outAttrs.put( new AttributeImpl( "triplesecResynchCount", Integer.toString( p.getResynchCount() ) ) );
+        outAttrs.put( new AttributeImpl( "triplesecFailuresInEpoch", Integer.toString( p.getFailuresInEpoch() ) ) );
         if ( p.getInfo() != null )
         {
-            outAttrs.put( new BasicAttribute( "safehausInfo", p.getInfo() ) );
+            outAttrs.put( new BasicAttribute( "triplesecInfo", p.getInfo() ) );
         }
 
         Result r = new Result( obj, outAttrs );
@@ -191,6 +191,6 @@
 
     public Object getStateToBind( Object obj, Name name, Context nameCtx, Hashtable environment ) throws NamingException
     {
-        throw new UnsupportedOperationException( "Structural objectClass needed for safehausProfile within additional attributes!" );
+        throw new UnsupportedOperationException( "Structural objectClass needed for triplesecProfile within additional attributes!" );
     }
 }

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java Fri Aug 10 17:47:23 2007
@@ -81,16 +81,16 @@
         String ldif = "dn: cn=bogus\n"
             + "cn: Alex Karasulu\n" + "sn: Karasulu\n" + "givenname: Alex\n" + "objectClass: top\n"
             + "objectClass: person\n" + "objectClass: organizationalPerson\n" + "objectClass: inetOrgPerson\n"
-            + "objectClass: krb5Principal\n" + "objectClass: krb5KDCEntry\n" + "objectClass: safehausProfile\n"
+            + "objectClass: krb5Principal\n" + "objectClass: krb5KDCEntry\n" + "objectClass: triplesecProfile\n"
             + "ou: Directory\n" + "ou: Users\n" + "l: Jacksonville\n" + "uid: akarasulu2\n"
             + "krb5PrincipalName: akarasulu@EXAMPLE.COM\n" + "krb5KeyVersionNumber: 0\n"
             + "mail: akarasulu@example.com\n" + "telephonenumber: +1 904 982 6882\n"
             + "facsimiletelephonenumber: +1 904 982 6883\n" + "roomnumber: 666\n" + "userPassword: maxwell\n"
-            + "safehausUid: akarasulu2\n" + "safehausRealm: example.com\n" + "safehausLabel: example realm\n"
-            + "safehausFactor: 34258723456\n" + "safehausSecret:: d$U*E&*^dss%$(345j\n"
-            + "safehausFailuresInEpoch: 7\n" + "safehausResynchCount: -1\n" + "safehausTokenPin: 1234\n"
-            + "safehausNotifyBy: sms\n"
-            + "safehausInfo: for testcases\n";
+            + "triplesecUid: akarasulu2\n" + "triplesecRealm: example.com\n" + "triplesecLabel: example realm\n"
+            + "triplesecFactor: 34258723456\n" + "triplesecSecret:: d$U*E&*^dss%$(345j\n"
+            + "triplesecFailuresInEpoch: 7\n" + "triplesecResynchCount: -1\n" + "triplesecTokenPin: 1234\n"
+            + "triplesecNotifyBy: sms\n"
+            + "triplesecInfo: for testcases\n";
 
         LdifReader parser = new LdifReader();
         Entry entry = ( Entry ) parser.parseLdif( ldif ).get( 0 );
@@ -123,7 +123,7 @@
             "objectClass: inetOrgPerson\n" +
             "objectClass: krb5Principal\n" +
             "objectClass: krb5KDCEntry\n" +
-            "objectClass: safehausProfile\n" +
+            "objectClass: triplesecProfile\n" +
             "ou: Directory\n" +
             "ou: Users\n" +
             "l: Jacksonville\n" +
@@ -133,7 +133,7 @@
             "mail: akarasulu@example.com\n" +
             "telephonenumber: +1 904 982 6882\n" +
             "facsimiletelephonenumber: +1 904 982 6883\n" +
-            "safehausNotifyBy: sms\n" +
+            "triplesecNotifyBy: sms\n" +
             "roomnumber: 666\n" +
             "userPassword: maxwell\n";
 
@@ -156,12 +156,12 @@
         sysRoot.bind( "uid=akarasulu2", modifier.getServerProfile(), attributes );
         Attributes reload = sysRoot.getAttributes( "uid=akarasulu2" );
         assertNotNull( reload );
-        assertEquals( 56902748234756L, Long.parseLong( ( String ) reload.get( "safehausFactor" ).get() ) );
-        assertEquals( 234, Integer.parseInt( ( String ) reload.get( "safehausFailuresInEpoch" ).get() ) );
-        assertEquals( 2, Integer.parseInt( ( String ) reload.get( "safehausResynchCount" ).get() ) );
-        assertEquals( "akarasulu2", reload.get( "safehausUid" ).get() );
-        assertEquals( "example.com", reload.get( "safehausRealm" ).get() );
-        assertEquals( "test domain", reload.get( "safehausLabel" ).get() );
-        assertEquals( "just some info", reload.get( "safehausInfo" ).get() );
+        assertEquals( 56902748234756L, Long.parseLong( ( String ) reload.get( "triplesecFactor" ).get() ) );
+        assertEquals( 234, Integer.parseInt( ( String ) reload.get( "triplesecFailuresInEpoch" ).get() ) );
+        assertEquals( 2, Integer.parseInt( ( String ) reload.get( "triplesecResynchCount" ).get() ) );
+        assertEquals( "akarasulu2", reload.get( "triplesecUid" ).get() );
+        assertEquals( "example.com", reload.get( "triplesecRealm" ).get() );
+        assertEquals( "test domain", reload.get( "triplesecLabel" ).get() );
+        assertEquals( "just some info", reload.get( "triplesecInfo" ).get() );
     }
 }

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java Fri Aug 10 17:47:23 2007
@@ -153,7 +153,7 @@
         store.init();
 
 //        List filters = Collections.singletonList( new Krb5KdcEntryFilter() );
-//        LdifFileLoader ldifLoader = new LdifFileLoader( userContext, new File( "safehaus.ldif" ), filters, getClass().getClassLoader() );
+//        LdifFileLoader ldifLoader = new LdifFileLoader( userContext, new File( "triplesec.ldif" ), filters, getClass().getClassLoader() );
 //        ldifLoader.execute();
 
         assertNotNull( store );

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/test/resources/safehaus.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/test/resources/safehaus.ldif?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/test/resources/safehaus.ldif (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/test/resources/safehaus.ldif Fri Aug 10 17:47:23 2007
@@ -41,7 +41,7 @@
 objectclass: inetOrgPerson
 objectclass: krb5Principal
 objectclass: krb5KDCEntry
-objectclass: safehausProfile
+objectclass: triplesecProfile
 ou: Directory
 ou: Users
 l: Jacksonville
@@ -53,16 +53,16 @@
 facsimiletelephonenumber: +1 904 982 6883
 roomnumber: 666
 apacheSamType: 7
-safehausUid: akarasulu
-safehausRealm: EXAMPLE.COM
-safehausLabel: example realm
-safehausFactor: 27304238
-safehausSecret:: aaaabbbbccccdddd
-safehausFailuresInEpoch: 0
-safehausResynchCount: -1
-safehausInfo: test account
-safehausTokenPin: 1234
-safehausNotifyBy:sms
+triplesecUid: akarasulu
+triplesecRealm: EXAMPLE.COM
+triplesecLabel: example realm
+triplesecFactor: 27304238
+triplesecSecret:: aaaabbbbccccdddd
+triplesecFailuresInEpoch: 0
+triplesecResynchCount: -1
+triplesecInfo: test account
+triplesecTokenPin: 1234
+triplesecNotifyBy:sms
 userpassword: maxwell
 
 dn: uid=lockedout, ou=Users, dc=example,dc=com
@@ -76,7 +76,7 @@
 objectclass: inetOrgPerson
 objectclass: krb5Principal
 objectclass: krb5KDCEntry
-objectclass: safehausProfile
+objectclass: triplesecProfile
 ou: Directory
 ou: Users
 l: DummyCity
@@ -87,16 +87,16 @@
 telephonenumber: +1 904 982 6882
 facsimiletelephonenumber: +1 904 982 6883
 roomnumber: 699
-safehausUid: lockedout
-safehausRealm: EXAMPLE.COM
-safehausLabel: example realm
-safehausFactor: 101347012
-safehausSecret:: (Q-H23BQ#SDsdkf3o&81923r
-safehausFailuresInEpoch: 20
-safehausResynchCount: -1
-safehausTokenPin: 1234
-safehausNotifyBy:sms
-safehausInfo: unlucky account
+triplesecUid: lockedout
+triplesecRealm: EXAMPLE.COM
+triplesecLabel: example realm
+triplesecFactor: 101347012
+triplesecSecret:: (Q-H23BQ#SDsdkf3o&81923r
+triplesecFailuresInEpoch: 20
+triplesecResynchCount: -1
+triplesecTokenPin: 1234
+triplesecNotifyBy:sms
+triplesecInfo: unlucky account
 userpassword: asdfasdf
 
 dn: uid=erodriguez, ou=Users, dc=example,dc=com
@@ -110,7 +110,7 @@
 objectclass: inetOrgPerson
 objectclass: krb5Principal
 objectclass: krb5KDCEntry
-objectclass: safehausProfile
+objectclass: triplesecProfile
 ou: Directory
 ou: Users
 l: Boston
@@ -121,16 +121,16 @@
 telephonenumber: +1 408 555 9187
 facsimiletelephonenumber: +1 408 555 8473
 roomnumber: 667
-safehausUid: erodriguez
-safehausRealm: EXAMPLE.COM
-safehausLabel: example realm
-safehausFactor: 917483720127847
-safehausSecret:: xcJqp45S80e8fahs&@rq1I98awg8)^*
-safehausFailuresInEpoch: 0
-safehausTokenPin: 1234
-safehausResynchCount: -1
-safehausNotifyBy:sms
-safehausInfo: test account
+triplesecUid: erodriguez
+triplesecRealm: EXAMPLE.COM
+triplesecLabel: example realm
+triplesecFactor: 917483720127847
+triplesecSecret:: xcJqp45S80e8fahs&@rq1I98awg8)^*
+triplesecFailuresInEpoch: 0
+triplesecTokenPin: 1234
+triplesecResynchCount: -1
+triplesecNotifyBy:sms
+triplesecInfo: test account
 userpassword: noices
 
 dn: uid=krbtgt, ou=Users, dc=example,dc=com

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java Fri Aug 10 17:47:23 2007
@@ -353,7 +353,7 @@
         {
             openToolbarButton = new JButton();
             openToolbarButton.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/fileopen_22x22.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/fileopen_22x22.png" ) ) );
             openToolbarButton.setBorder( new EtchedBorder() );
             openToolbarButton.addActionListener( new java.awt.event.ActionListener()
             {
@@ -378,7 +378,7 @@
         {
             closeToolbarButton = new JButton();
             closeToolbarButton.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/fileclose_22x22.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/fileclose_22x22.png" ) ) );
             closeToolbarButton.setBorder( new EtchedBorder() );
         }
         return closeToolbarButton;
@@ -396,7 +396,7 @@
         {
             saveToolbarButton = new JButton();
             saveToolbarButton.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/filesave_22x22.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/filesave_22x22.png" ) ) );
             saveToolbarButton.setToolTipText( "Save Triplesec Configuration File" );
             saveToolbarButton.setBorder( new EtchedBorder() );
         }
@@ -416,7 +416,7 @@
             statusLabel = new JLabel();
             statusLabel.setText( " Status: ok" );
             statusLabel.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/status_ok_16x16.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/status_ok_16x16.png" ) ) );
             statusLabel.setPreferredSize( new java.awt.Dimension( 38, 19 ) );
             statusPanel = new JPanel();
             statusPanel.setLayout( new BorderLayout() );
@@ -597,7 +597,7 @@
             connectButton = new JButton();
             connectButton.setBorder( new EtchedBorder() );
             connectButton.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/connect_22x22.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/connect_22x22.png" ) ) );
             connectButton.setToolTipText( "Connect to Triplesec Server" );
             connectButton.addActionListener( new java.awt.event.ActionListener()
             {
@@ -623,7 +623,7 @@
             disconnectButton = new JButton();
             disconnectButton.setBorder( new EtchedBorder() );
             disconnectButton.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/disconnect_22x22.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/disconnect_22x22.png" ) ) );
             disconnectButton.setToolTipText( "Disconnect from Triplesec Server" );
             disconnectButton.addActionListener( new java.awt.event.ActionListener()
             {

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java Fri Aug 10 17:47:23 2007
@@ -303,7 +303,7 @@
         {
             iconLabel = new JLabel();
             iconLabel.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/application_48x48.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/application_48x48.png" ) ) );
             iconLabel.setPreferredSize( new java.awt.Dimension( 48, 48 ) );
             iconLabel.setText( "" );
             iconLabel.setVerticalTextPosition( javax.swing.SwingConstants.BOTTOM );

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java Fri Aug 10 17:47:23 2007
@@ -168,21 +168,21 @@
             {
                 isLoading = true;
                 adminFrame.setStatusMessage( "Opening " + layout.getConfigurationFile(), new ImageIcon( getClass()
-                    .getResource( "/org/safehaus/triplesec/admin/swing/fileopen_16x16.png" ) ) );
+                    .getResource( "/org/triplesec/triplesec/admin/swing/fileopen_16x16.png" ) ) );
                 ApplicationContext factory = new FileSystemXmlApplicationContext( layout.getConfigurationFile().toURL()
                     .toString() );
                 configuration = ( MutableTriplesecStartupConfiguration ) factory.getBean( "configuration" );
                 env = ( Properties ) factory.getBean( "environment" );
                 isLoading = false;
                 adminFrame.setStatusMessage( "ok", new ImageIcon( getClass().getResource(
-                    "/org/safehaus/triplesec/admin/swing/status_ok_16x16.png" ) ) );
+                    "/org/triplesec/triplesec/admin/swing/status_ok_16x16.png" ) ) );
             }
             catch ( Exception e )
             {
                 isLoading = false;
                 String msg = "Failed to open " + layout.getConfigurationFile();
                 adminFrame.setStatusMessage( msg, new ImageIcon( getClass().getResource(
-                    "/org/safehaus/triplesec/admin/swing/error_16x16.png" ) ) );
+                    "/org/triplesec/triplesec/admin/swing/error_16x16.png" ) ) );
                 log.error( msg, e );
                 JOptionPane.showMessageDialog( adminFrame, msg, "Failed to load.", JOptionPane.ERROR_MESSAGE );
             }

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java Fri Aug 10 17:47:23 2007
@@ -304,7 +304,7 @@
         {
             iconLabel = new JLabel();
             iconLabel.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/group_48x48.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/group_48x48.png" ) ) );
             iconLabel.setPreferredSize( new java.awt.Dimension( 48, 48 ) );
             iconLabel.setText( "" );
             iconLabel.setVerticalTextPosition( javax.swing.SwingConstants.BOTTOM );

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java Fri Aug 10 17:47:23 2007
@@ -248,7 +248,7 @@
             addUsersButton.setText( "" );
             addUsersButton.setToolTipText( "Add selected users to group" );
             addUsersButton.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/rightarrow_16x16.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/rightarrow_16x16.png" ) ) );
             addUsersButton.addActionListener( new java.awt.event.ActionListener()
             {
                 public void actionPerformed( java.awt.event.ActionEvent e )
@@ -277,7 +277,7 @@
         {
             removeUsersButton = new JButton();
             removeUsersButton.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/leftarrow_16x16.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/leftarrow_16x16.png" ) ) );
             removeUsersButton.addActionListener( new java.awt.event.ActionListener()
             {
                 public void actionPerformed( java.awt.event.ActionEvent e )

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeCellRenderer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeCellRenderer.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeCellRenderer.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeCellRenderer.java Fri Aug 10 17:47:23 2007
@@ -52,54 +52,54 @@
     // -----------------------------------------------------------------------
     
     private ImageIcon rootIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/home2_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/home2_16x16.png" ) );
     
     private ImageIcon localUserIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/local_user_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/local_user_16x16.png" ) );
     private ImageIcon externalUserIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/external_user_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/external_user_16x16.png" ) );
     private ImageIcon hauskeysUserIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/hauskeys_user_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/hauskeys_user_16x16.png" ) );
     
     private ImageIcon userContainerClosedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/user_container_closed_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/user_container_closed_16x16.png" ) );
     private ImageIcon userContainerOpenedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/user_container_opened_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/user_container_opened_16x16.png" ) );
     
     private ImageIcon profileIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/profile2_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/profile2_16x16.png" ) );
     private ImageIcon profileContainerClosedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/profile_container_closed_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/profile_container_closed_16x16.png" ) );
     private ImageIcon profileContainerOpenedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/profile_container_opened_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/profile_container_opened_16x16.png" ) );
     
     private ImageIcon permissionIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/permission2_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/permission2_16x16.png" ) );
     private ImageIcon permissionContainerClosedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/permission_container_closed_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/permission_container_closed_16x16.png" ) );
     private ImageIcon permissionContainerOpenedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/permission_container_opened_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/permission_container_opened_16x16.png" ) );
     
     private ImageIcon applicationIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/application_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/application_16x16.png" ) );
     private ImageIcon applicationContainerClosedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/application_container_closed_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/application_container_closed_16x16.png" ) );
     private ImageIcon applicationContainerOpenedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/application_container_opened_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/application_container_opened_16x16.png" ) );
 
     private ImageIcon roleIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/role_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/role_16x16.png" ) );
     private ImageIcon roleContainerClosedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/role_container_closed_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/role_container_closed_16x16.png" ) );
     private ImageIcon roleContainerOpenedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/role_container_opened_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/role_container_opened_16x16.png" ) );
 
     private ImageIcon groupIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/group_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/group_16x16.png" ) );
     private ImageIcon groupContainerClosedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/group_container_closed_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/group_container_closed_16x16.png" ) );
     private ImageIcon groupContainerOpenedIcon = new ImageIcon( 
-        getClass().getResource( "/org/safehaus/triplesec/admin/swing/group_container_opened_16x16.png" ) );
+        getClass().getResource( "/org/triplesec/triplesec/admin/swing/group_container_opened_16x16.png" ) );
 
     private DefaultMutableTreeNode rootNode;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewApplicationPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewApplicationPanel.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewApplicationPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewApplicationPanel.java Fri Aug 10 17:47:23 2007
@@ -461,7 +461,7 @@
         {
             iconLabel = new JLabel();
             iconLabel.setIcon( new ImageIcon( getClass().getResource(
-                    "/org/safehaus/triplesec/admin/swing/new_application_48x48.png" ) ) );
+                    "/org/triplesec/triplesec/admin/swing/new_application_48x48.png" ) ) );
             iconLabel.setPreferredSize( new java.awt.Dimension( 48, 48 ) );
             iconLabel.setText( "" );
             iconLabel.setVerticalTextPosition( javax.swing.SwingConstants.BOTTOM );

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewGroupPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewGroupPanel.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewGroupPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewGroupPanel.java Fri Aug 10 17:47:23 2007
@@ -266,7 +266,7 @@
         {
             iconLabel = new JLabel();
             iconLabel.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/new_group_48x48.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/new_group_48x48.png" ) ) );
             iconLabel.setPreferredSize( new java.awt.Dimension( 48, 48 ) );
             iconLabel.setText( "" );
             iconLabel.setVerticalTextPosition( javax.swing.SwingConstants.BOTTOM );

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewPermissionPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewPermissionPanel.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewPermissionPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewPermissionPanel.java Fri Aug 10 17:47:23 2007
@@ -245,7 +245,7 @@
         {
             iconLabel = new JLabel();
             iconLabel.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/new_permission2_48x48.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/new_permission2_48x48.png" ) ) );
             iconLabel.setPreferredSize( new java.awt.Dimension( 48, 48 ) );
             iconLabel.setText( "" );
             iconLabel.setVerticalTextPosition( javax.swing.SwingConstants.BOTTOM );

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewProfilePanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewProfilePanel.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewProfilePanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewProfilePanel.java Fri Aug 10 17:47:23 2007
@@ -283,7 +283,7 @@
         {
             iconLabel = new JLabel();
             iconLabel.setIcon( new ImageIcon( getClass().getResource(
-                    "/org/safehaus/triplesec/admin/swing/new_profile2_48x48.png" ) ) );
+                    "/org/triplesec/triplesec/admin/swing/new_profile2_48x48.png" ) ) );
             iconLabel.setPreferredSize( new java.awt.Dimension( 48, 48 ) );
             iconLabel.setText( "" );
             iconLabel.setVerticalTextPosition( javax.swing.SwingConstants.BOTTOM );

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewRolePanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewRolePanel.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewRolePanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewRolePanel.java Fri Aug 10 17:47:23 2007
@@ -250,7 +250,7 @@
         {
             iconLabel = new JLabel();
             iconLabel.setIcon( new ImageIcon( getClass().getResource(
-                "/org/safehaus/triplesec/admin/swing/new_role_48x48.png" ) ) );
+                "/org/triplesec/triplesec/admin/swing/new_role_48x48.png" ) ) );
             iconLabel.setPreferredSize( new java.awt.Dimension( 48, 48 ) );
             iconLabel.setText( "" );
             iconLabel.setVerticalTextPosition( javax.swing.SwingConstants.BOTTOM );

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewUserPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewUserPanel.java?view=diff&rev=564813&r1=564812&r2=564813
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewUserPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewUserPanel.java Fri Aug 10 17:47:23 2007
@@ -71,7 +71,7 @@
     private JTable existingUsersTable = null;
     private ExistingUsersTableModel existingUsersTableModel = null; //  @jve:decl-index=0:visual-constraint=""
     private ImageIcon newUserIcon = new ImageIcon( getClass().getResource(
-        "/org/safehaus/triplesec/admin/swing/new_user_48x48.png" ) );
+        "/org/triplesec/triplesec/admin/swing/new_user_48x48.png" ) );
     private ProvisioningPanel provisioningPanel;
     private HotpSettingsPanel hotpSettingsPanel;
     private ExternalLinkPanel externalLinkPanel;



Mime
View raw message