Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 548 invoked from network); 24 Jul 2007 19:53:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Jul 2007 19:53:54 -0000 Received: (qmail 39555 invoked by uid 500); 24 Jul 2007 19:53:54 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 39488 invoked by uid 500); 24 Jul 2007 19:53:54 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 39458 invoked by uid 99); 24 Jul 2007 19:53:54 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jul 2007 12:53:54 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jul 2007 12:53:49 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7430D1A981D; Tue, 24 Jul 2007 12:53:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r559180 [2/3] - in /directory/triplesec/trunk: configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ main/src/main/java/org/apache/directory/triplesec/ tools/src/main/java/org/apache/ tools/src/main/java/org/apache/di... Date: Tue, 24 Jul 2007 19:53:04 -0000 To: commits@directory.apache.org From: ckoppelt@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070724195329.7430D1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Copied: directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/EmailNotification.java (from r559177, directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/EmailNotification.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/EmailNotification.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/EmailNotification.java&r1=559177&p2=directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/EmailNotification.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/EmailNotification.java (original) +++ directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/EmailNotification.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.activation; +package org.apache.directory.triplesec.activation; /** Copied: directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccount.java (from r559177, directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/HotpAccount.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccount.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/HotpAccount.java&r1=559177&p2=directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccount.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/HotpAccount.java (original) +++ directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccount.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.activation; +package org.apache.directory.triplesec.activation; import org.apache.directory.triplesec.sms.Carrier; Copied: directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccountModifier.java (from r559177, directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/HotpAccountModifier.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccountModifier.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/HotpAccountModifier.java&r1=559177&p2=directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccountModifier.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/HotpAccountModifier.java (original) +++ directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccountModifier.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.activation; +package org.apache.directory.triplesec.activation; import java.io.UnsupportedEncodingException; Copied: directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/Notification.java (from r559177, directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/Notification.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/Notification.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/Notification.java&r1=559177&p2=directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/Notification.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/Notification.java (original) +++ directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/Notification.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.activation; +package org.apache.directory.triplesec.activation; import java.util.Date; Copied: directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationQueue.java (from r559177, directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/NotificationQueue.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationQueue.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/NotificationQueue.java&r1=559177&p2=directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationQueue.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/NotificationQueue.java (original) +++ directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationQueue.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.activation; +package org.apache.directory.triplesec.activation; import java.util.ArrayList; Copied: directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java (from r559177, directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/NotificationUtil.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/NotificationUtil.java&r1=559177&p2=directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/NotificationUtil.java (original) +++ directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.activation; +package org.apache.directory.triplesec.activation; import java.io.IOException; Copied: directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ServletUtils.java (from r559177, directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ServletUtils.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ServletUtils.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ServletUtils.java&r1=559177&p2=directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ServletUtils.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ServletUtils.java (original) +++ directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ServletUtils.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.activation; +package org.apache.directory.triplesec.activation; import java.io.IOException; Copied: directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/SmsNotification.java (from r559177, directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/SmsNotification.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/SmsNotification.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/SmsNotification.java&r1=559177&p2=directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/SmsNotification.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/SmsNotification.java (original) +++ directory/triplesec/trunk/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/SmsNotification.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.activation; +package org.apache.directory.triplesec.activation; import org.apache.directory.triplesec.sms.Carrier; Modified: directory/triplesec/trunk/webapp-activation/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/webapp/WEB-INF/web.xml?view=diff&rev=559180&r1=559179&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-activation/src/main/webapp/WEB-INF/web.xml (original) +++ directory/triplesec/trunk/webapp-activation/src/main/webapp/WEB-INF/web.xml Tue Jul 24 12:52:22 2007 @@ -5,7 +5,7 @@ activation - org.safehaus.triplesec.activation.ActivateAccountFilter + org.apache.directory.triplesec.activation.ActivateAccountFilter Copied: directory/triplesec/trunk/webapp-activation/src/test/org/apache/directory/triplesec/activation/ActivationUtilsTest.java (from r559177, directory/triplesec/trunk/webapp-activation/src/test/org/safehaus/triplesec/activation/ActivationUtilsTest.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/test/org/apache/directory/triplesec/activation/ActivationUtilsTest.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-activation/src/test/org/safehaus/triplesec/activation/ActivationUtilsTest.java&r1=559177&p2=directory/triplesec/trunk/webapp-activation/src/test/org/apache/directory/triplesec/activation/ActivationUtilsTest.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-activation/src/test/org/safehaus/triplesec/activation/ActivationUtilsTest.java (original) +++ directory/triplesec/trunk/webapp-activation/src/test/org/apache/directory/triplesec/activation/ActivationUtilsTest.java Tue Jul 24 12:52:22 2007 @@ -1,4 +1,4 @@ -package org.safehaus.triplesec.activation; +package org.apache.directory.triplesec.activation; import junit.framework.TestCase; Copied: directory/triplesec/trunk/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java (from r559177, directory/triplesec/trunk/webapp-changelog/src/main/java/org/safehaus/triplesec/changelogui/ChangelogController.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-changelog/src/main/java/org/safehaus/triplesec/changelogui/ChangelogController.java&r1=559177&p2=directory/triplesec/trunk/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-changelog/src/main/java/org/safehaus/triplesec/changelogui/ChangelogController.java (original) +++ directory/triplesec/trunk/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.changelogui; +package org.apache.directory.triplesec.changelogui; import java.sql.Connection; import java.sql.DriverManager; Copied: directory/triplesec/trunk/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/RunChangelogUI.java (from r559177, directory/triplesec/trunk/webapp-changelog/src/test/java/org/safehaus/triplesec/changelogui/RunChangelogUI.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/RunChangelogUI.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-changelog/src/test/java/org/safehaus/triplesec/changelogui/RunChangelogUI.java&r1=559177&p2=directory/triplesec/trunk/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/RunChangelogUI.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-changelog/src/test/java/org/safehaus/triplesec/changelogui/RunChangelogUI.java (original) +++ directory/triplesec/trunk/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/RunChangelogUI.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.changelogui; +package org.apache.directory.triplesec.changelogui; Copied: directory/triplesec/trunk/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/TriplesecChangelogWebappUnit.java (from r559177, directory/triplesec/trunk/webapp-changelog/src/test/java/org/safehaus/triplesec/changelogui/TriplesecChangelogWebappUnit.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/TriplesecChangelogWebappUnit.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-changelog/src/test/java/org/safehaus/triplesec/changelogui/TriplesecChangelogWebappUnit.java&r1=559177&p2=directory/triplesec/trunk/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/TriplesecChangelogWebappUnit.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-changelog/src/test/java/org/safehaus/triplesec/changelogui/TriplesecChangelogWebappUnit.java (original) +++ directory/triplesec/trunk/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/TriplesecChangelogWebappUnit.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.changelogui; +package org.apache.directory.triplesec.changelogui; import java.io.File; import java.sql.Connection; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/AccountDao.java (from r559009, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/AccountDao.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/AccountDao.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/AccountDao.java&r1=559009&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/AccountDao.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/AccountDao.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/AccountDao.java Tue Jul 24 12:52:22 2007 @@ -17,9 +17,9 @@ * under the License. * */ -package org.safehaus.triplesec.demo.dao; +package org.apache.directory.triplesec.demo.dao; -import org.safehaus.triplesec.demo.model.Account; +import org.apache.directory.triplesec.demo.model.Account; import java.util.Iterator; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java (from r559009, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/InvestmentsDao.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/InvestmentsDao.java&r1=559009&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/InvestmentsDao.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java Tue Jul 24 12:52:22 2007 @@ -17,9 +17,9 @@ * under the License. * */ -package org.safehaus.triplesec.demo.dao; +package org.apache.directory.triplesec.demo.dao; -import org.safehaus.triplesec.demo.model.Investments; +import org.apache.directory.triplesec.demo.model.Investments; public interface InvestmentsDao { Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java (from r559009, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/QueryParam.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/QueryParam.java&r1=559009&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/QueryParam.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo.dao; +package org.apache.directory.triplesec.demo.dao; /** * Encapsulates the query parameters to be passed to the daos. Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java Tue Jul 24 12:52:22 2007 @@ -17,10 +17,10 @@ * under the License. * */ -package org.safehaus.triplesec.demo.dao.jdbc; +package org.apache.directory.triplesec.demo.dao.jdbc; -import org.safehaus.triplesec.demo.dao.InvestmentsDao; -import org.safehaus.triplesec.demo.model.Investments; +import org.apache.directory.triplesec.demo.dao.InvestmentsDao; +import org.apache.directory.triplesec.demo.model.Investments; import java.sql.Connection; import java.sql.ResultSet; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/mock/MockAccountDao.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/mock/MockAccountDao.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/mock/MockAccountDao.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java Tue Jul 24 12:52:22 2007 @@ -17,13 +17,13 @@ * under the License. * */ -package org.safehaus.triplesec.demo.dao.mock; +package org.apache.directory.triplesec.demo.dao.mock; +import org.apache.directory.triplesec.demo.dao.AccountDao; +import org.apache.directory.triplesec.demo.dao.QueryParam; +import org.apache.directory.triplesec.demo.model.Account; +import org.apache.directory.triplesec.demo.service.Registry; import org.apache.directory.triplesec.guardian.ApplicationPolicy; -import org.safehaus.triplesec.demo.dao.AccountDao; -import org.safehaus.triplesec.demo.dao.QueryParam; -import org.safehaus.triplesec.demo.model.Account; -import org.safehaus.triplesec.demo.service.Registry; import java.util.Iterator; import java.util.Map; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Account.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/model/Account.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Account.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/model/Account.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Account.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/model/Account.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Account.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo.model; +package org.apache.directory.triplesec.demo.model; import java.io.Serializable; import java.util.List; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Investments.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/model/Investments.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Investments.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/model/Investments.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Investments.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/model/Investments.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Investments.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo.model; +package org.apache.directory.triplesec.demo.model; import java.util.ArrayList; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/AuthenticatedPage.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/AuthenticatedPage.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/AuthenticatedPage.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo.security; +package org.apache.directory.triplesec.demo.security; /** * Simple tagging interface that denotes a web page as requiring Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/AuthenticatedWebSession.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/AuthenticatedWebSession.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/AuthenticatedWebSession.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java Tue Jul 24 12:52:22 2007 @@ -17,15 +17,15 @@ * under the License. * */ -package org.safehaus.triplesec.demo.security; +package org.apache.directory.triplesec.demo.security; +import org.apache.directory.triplesec.demo.service.Registry; import org.apache.directory.triplesec.guardian.Profile; import org.apache.directory.triplesec.jaas.AccountLockedOutException; import org.apache.directory.triplesec.jaas.PreauthFailedException; import org.apache.directory.triplesec.jaas.ResynchInProgressException; import org.apache.directory.triplesec.jaas.ResynchStartingException; import org.apache.directory.triplesec.jaas.SafehausPrincipal; -import org.safehaus.triplesec.demo.service.Registry; import wicket.protocol.http.WebApplication; import wicket.protocol.http.WebSession; import wicket.util.string.Strings; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/PageAuthorizationStrategy.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/PageAuthorizationStrategy.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/PageAuthorizationStrategy.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo.security; +package org.apache.directory.triplesec.demo.security; import wicket.authorization.strategies.page.SimplePageAuthorizationStrategy; import wicket.Session; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/DefaultPolicyManager.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/DefaultPolicyManager.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/DefaultPolicyManager.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo.service; +package org.apache.directory.triplesec.demo.service; import org.apache.directory.triplesec.guardian.ApplicationPolicy; import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/DefaultSmsManager.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/DefaultSmsManager.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/DefaultSmsManager.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo.service; +package org.apache.directory.triplesec.demo.service; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/PolicyManager.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/PolicyManager.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/PolicyManager.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo.service; +package org.apache.directory.triplesec.demo.service; import org.apache.directory.triplesec.guardian.ApplicationPolicy; import org.apache.directory.triplesec.jaas.SafehausPrincipal; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/Registry.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/Registry.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/Registry.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java Tue Jul 24 12:52:22 2007 @@ -24,7 +24,7 @@ * Time: 12:02:48 AM * To change this template use File | Settings | File Templates. */ -package org.safehaus.triplesec.demo.service; +package org.apache.directory.triplesec.demo.service; /** * A common place to get business delegates. Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/SmsManager.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/SmsManager.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/SmsManager.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo.service; +package org.apache.directory.triplesec.demo.service; /** * Created by IntelliJ IDEA. Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java (from r559009, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/AccountDataProvider.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/AccountDataProvider.java&r1=559009&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/AccountDataProvider.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java Tue Jul 24 12:52:22 2007 @@ -17,11 +17,12 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view; +package org.apache.directory.triplesec.demo.view; import wicket.extensions.markup.html.repeater.util.SortableDataProvider; -import org.safehaus.triplesec.demo.dao.AccountDao; -import org.safehaus.triplesec.demo.dao.QueryParam; + +import org.apache.directory.triplesec.demo.dao.AccountDao; +import org.apache.directory.triplesec.demo.dao.QueryParam; import java.util.Iterator; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java (from r559009, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/AccountDetachableModel.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/AccountDetachableModel.java&r1=559009&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/AccountDetachableModel.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java Tue Jul 24 12:52:22 2007 @@ -17,13 +17,14 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view; +package org.apache.directory.triplesec.demo.view; import wicket.model.AbstractDetachableModel; import wicket.model.IModel; import wicket.Component; -import org.safehaus.triplesec.demo.model.Account; -import org.safehaus.triplesec.demo.dao.AccountDao; + +import org.apache.directory.triplesec.demo.dao.AccountDao; +import org.apache.directory.triplesec.demo.model.Account; /** * Base class for contact detachable models. This class implements Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java (from r559009, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/ChartResource.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/ChartResource.java&r1=559009&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/ChartResource.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java Tue Jul 24 12:52:22 2007 @@ -17,15 +17,15 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view; +package org.apache.directory.triplesec.demo.view; +import org.apache.directory.triplesec.demo.model.Account; import org.jCharts.chartData.ChartDataException; import org.jCharts.chartData.PieChartDataSet; import org.jCharts.nonAxisChart.PieChart2D; import org.jCharts.properties.ChartProperties; import org.jCharts.properties.LegendProperties; import org.jCharts.properties.PieChart2DProperties; -import org.safehaus.triplesec.demo.model.Account; import wicket.markup.html.image.resource.BufferedDynamicImageResource; import java.awt.Color; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java (from r559009, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/ProxyDataProvider.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/ProxyDataProvider.java&r1=559009&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/ProxyDataProvider.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java Tue Jul 24 12:52:22 2007 @@ -17,10 +17,11 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view; +package org.apache.directory.triplesec.demo.view; + +import org.apache.directory.triplesec.demo.dao.AccountDao; +import org.apache.directory.triplesec.demo.model.Account; -import org.safehaus.triplesec.demo.dao.AccountDao; -import org.safehaus.triplesec.demo.model.Account; import wicket.model.IModel; public class ProxyDataProvider extends AccountDataProvider Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java (from r559009, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/ProxyModel.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/ProxyModel.java&r1=559009&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/ProxyModel.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java Tue Jul 24 12:52:22 2007 @@ -17,10 +17,10 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view; +package org.apache.directory.triplesec.demo.view; -import org.safehaus.triplesec.demo.dao.AccountDao; -import org.safehaus.triplesec.demo.model.Account; +import org.apache.directory.triplesec.demo.dao.AccountDao; +import org.apache.directory.triplesec.demo.model.Account; public class ProxyModel extends AccountDetachableModel { Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java (from r559009, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/TriplesecDemoApplication.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/TriplesecDemoApplication.java&r1=559009&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/TriplesecDemoApplication.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java Tue Jul 24 12:52:22 2007 @@ -17,16 +17,16 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view; +package org.apache.directory.triplesec.demo.view; -import org.safehaus.triplesec.demo.security.AuthenticatedPage; -import org.safehaus.triplesec.demo.security.AuthenticatedWebSession; -import org.safehaus.triplesec.demo.security.PageAuthorizationStrategy; -import org.safehaus.triplesec.demo.view.pages.HomePage; -import org.safehaus.triplesec.demo.view.pages.LoginPage; -import org.safehaus.triplesec.demo.dao.AccountDao; -import org.safehaus.triplesec.demo.service.Registry; +import org.apache.directory.triplesec.demo.dao.AccountDao; +import org.apache.directory.triplesec.demo.security.AuthenticatedPage; +import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession; +import org.apache.directory.triplesec.demo.security.PageAuthorizationStrategy; +import org.apache.directory.triplesec.demo.service.Registry; +import org.apache.directory.triplesec.demo.view.pages.HomePage; +import org.apache.directory.triplesec.demo.view.pages.LoginPage; import wicket.ISessionFactory; import wicket.Session; import wicket.spring.SpringWebApplication; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/borders/PageBorder.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/borders/PageBorder.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/borders/PageBorder.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java Tue Jul 24 12:52:22 2007 @@ -17,13 +17,13 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.borders; +package org.apache.directory.triplesec.demo.view.borders; +import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession; +import org.apache.directory.triplesec.demo.view.pages.AdminPage; +import org.apache.directory.triplesec.demo.view.pages.HomePage; +import org.apache.directory.triplesec.demo.view.pages.LoginPage; import org.apache.directory.triplesec.guardian.Profile; -import org.safehaus.triplesec.demo.security.AuthenticatedWebSession; -import org.safehaus.triplesec.demo.view.pages.HomePage; -import org.safehaus.triplesec.demo.view.pages.LoginPage; -import org.safehaus.triplesec.demo.view.pages.AdminPage; import wicket.markup.html.border.Border; import wicket.markup.html.link.Link; import wicket.markup.html.basic.Label; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PanelBorder.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/borders/PanelBorder.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PanelBorder.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/borders/PanelBorder.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PanelBorder.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/borders/PanelBorder.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PanelBorder.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.borders; +package org.apache.directory.triplesec.demo.view.borders; import wicket.markup.html.border.Border; import wicket.markup.html.basic.Label; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/AdminPage.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/AdminPage.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/AdminPage.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java Tue Jul 24 12:52:22 2007 @@ -17,15 +17,17 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.pages; +package org.apache.directory.triplesec.demo.view.pages; +import org.apache.directory.triplesec.demo.dao.AccountDao; +import org.apache.directory.triplesec.demo.security.AuthenticatedPage; +import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession; +import org.apache.directory.triplesec.demo.view.ProxyDataProvider; +import org.apache.directory.triplesec.demo.view.TriplesecDemoApplication; import org.apache.directory.triplesec.guardian.Profile; -import org.safehaus.triplesec.demo.security.AuthenticatedPage; -import org.safehaus.triplesec.demo.security.AuthenticatedWebSession; -import org.safehaus.triplesec.demo.view.panels.ActionPanel; -import org.safehaus.triplesec.demo.view.TriplesecDemoApplication; -import org.safehaus.triplesec.demo.view.ProxyDataProvider; -import org.safehaus.triplesec.demo.dao.AccountDao; +import org.apache.directory.triplesec.demo.view.panels.ActionPanel; +import org.apache.directory.triplesec.demo.view.pages.BasePage; + import wicket.markup.html.basic.Label; import wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import wicket.extensions.markup.html.repeater.data.table.AbstractColumn; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/BasePage.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/BasePage.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/BasePage.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java Tue Jul 24 12:52:22 2007 @@ -17,11 +17,12 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.pages; +package org.apache.directory.triplesec.demo.view.pages; import wicket.markup.html.WebPage; import wicket.markup.html.border.Border; -import org.safehaus.triplesec.demo.view.borders.PageBorder; + +import org.apache.directory.triplesec.demo.view.borders.PageBorder; /** * Abstract base class for (most) all pages in the application. It will Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/ChartPage.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/ChartPage.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/ChartPage.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java Tue Jul 24 12:52:22 2007 @@ -17,11 +17,12 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.pages; +package org.apache.directory.triplesec.demo.view.pages; -import org.safehaus.triplesec.demo.view.ChartResource; -import org.safehaus.triplesec.demo.model.Account; -import org.safehaus.triplesec.demo.security.AuthenticatedPage; +import org.apache.directory.triplesec.demo.model.Account; +import org.apache.directory.triplesec.demo.security.AuthenticatedPage; +import org.apache.directory.triplesec.demo.view.ChartResource; +import org.apache.directory.triplesec.demo.view.pages.BasePage; import wicket.markup.html.image.Image; public class ChartPage extends BasePage implements AuthenticatedPage Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/HomePage.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/HomePage.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/HomePage.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java Tue Jul 24 12:52:22 2007 @@ -17,16 +17,17 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.pages; +package org.apache.directory.triplesec.demo.view.pages; +import org.apache.directory.triplesec.demo.dao.AccountDao; +import org.apache.directory.triplesec.demo.model.Account; +import org.apache.directory.triplesec.demo.security.AuthenticatedPage; +import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession; +import org.apache.directory.triplesec.demo.view.ChartResource; +import org.apache.directory.triplesec.demo.view.TriplesecDemoApplication; import org.apache.directory.triplesec.guardian.Profile; -import org.safehaus.triplesec.demo.view.ChartResource; -import org.safehaus.triplesec.demo.dao.AccountDao; -import org.safehaus.triplesec.demo.model.Account; -import org.safehaus.triplesec.demo.security.AuthenticatedPage; -import org.safehaus.triplesec.demo.security.AuthenticatedWebSession; -import org.safehaus.triplesec.demo.view.TriplesecDemoApplication; -import org.safehaus.triplesec.demo.view.panels.BuyPanel; +import org.apache.directory.triplesec.demo.view.pages.BasePage; +import org.apache.directory.triplesec.demo.view.panels.BuyPanel; import wicket.Application; import wicket.markup.html.basic.Label; import wicket.markup.html.image.Image; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/LoginPage.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/LoginPage.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/LoginPage.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java Tue Jul 24 12:52:22 2007 @@ -17,10 +17,10 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.pages; +package org.apache.directory.triplesec.demo.view.pages; -import org.safehaus.triplesec.demo.view.panels.LoginPanel; -import org.safehaus.triplesec.demo.security.AuthenticatedWebSession; +import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession; +import org.apache.directory.triplesec.demo.view.panels.LoginPanel; public class LoginPage extends BasePage Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/WapPushPage.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/WapPushPage.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/WapPushPage.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/WapPushPage.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/WapPushPage.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/WapPushPage.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/WapPushPage.java Tue Jul 24 12:52:22 2007 @@ -17,9 +17,9 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.pages; +package org.apache.directory.triplesec.demo.view.pages; -import org.safehaus.triplesec.demo.view.panels.WapPushPanel; +import org.apache.directory.triplesec.demo.view.panels.WapPushPanel; public class WapPushPage extends BasePage { Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/ActionPanel.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/ActionPanel.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/ActionPanel.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java Tue Jul 24 12:52:22 2007 @@ -17,10 +17,11 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.panels; +package org.apache.directory.triplesec.demo.view.panels; + +import org.apache.directory.triplesec.demo.model.Account; +import org.apache.directory.triplesec.demo.view.pages.ChartPage; -import org.safehaus.triplesec.demo.model.Account; -import org.safehaus.triplesec.demo.view.pages.ChartPage; import wicket.markup.html.link.Link; import wicket.markup.html.panel.Panel; import wicket.model.IModel; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/BasePanel.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/BasePanel.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/BasePanel.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java Tue Jul 24 12:52:22 2007 @@ -17,12 +17,13 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.panels; +package org.apache.directory.triplesec.demo.view.panels; import wicket.markup.html.panel.Panel; import wicket.model.IModel; import wicket.model.Model; -import org.safehaus.triplesec.demo.view.borders.PanelBorder; + +import org.apache.directory.triplesec.demo.view.borders.PanelBorder; public class BasePanel extends Panel { Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/BuyPanel.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/BuyPanel.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/BuyPanel.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java Tue Jul 24 12:52:22 2007 @@ -17,19 +17,21 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.panels; +package org.apache.directory.triplesec.demo.view.panels; +import org.apache.directory.triplesec.demo.dao.AccountDao; +import org.apache.directory.triplesec.demo.model.Account; +import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession; +import org.apache.directory.triplesec.demo.service.Registry; +import org.apache.directory.triplesec.demo.view.TriplesecDemoApplication; import org.apache.directory.triplesec.jaas.AccountLockedOutException; import org.apache.directory.triplesec.jaas.PreauthFailedException; import org.apache.directory.triplesec.jaas.ResynchInProgressException; import org.apache.directory.triplesec.jaas.ResynchStartingException; import org.apache.directory.triplesec.jaas.SafehausPrincipal; -import org.safehaus.triplesec.demo.dao.AccountDao; -import org.safehaus.triplesec.demo.model.Account; -import org.safehaus.triplesec.demo.security.AuthenticatedWebSession; -import org.safehaus.triplesec.demo.service.Registry; -import org.safehaus.triplesec.demo.view.TriplesecDemoApplication; -import org.safehaus.triplesec.demo.view.pages.HomePage; +import org.apache.directory.triplesec.demo.view.panels.BasePanel; +import org.apache.directory.triplesec.demo.view.pages.HomePage; + import wicket.Application; import wicket.markup.html.form.DropDownChoice; import wicket.markup.html.form.Form; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/LoginPanel.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/LoginPanel.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/LoginPanel.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java Tue Jul 24 12:52:22 2007 @@ -17,12 +17,14 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.panels; +package org.apache.directory.triplesec.demo.view.panels; -import org.safehaus.triplesec.demo.security.AuthenticatedWebSession; -import org.safehaus.triplesec.demo.view.TriplesecDemoApplication; -import org.safehaus.triplesec.demo.view.pages.WapPushPage; -import org.safehaus.triplesec.demo.service.Registry; +import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession; +import org.apache.directory.triplesec.demo.service.Registry; +import org.apache.directory.triplesec.demo.view.TriplesecDemoApplication; +import org.apache.directory.triplesec.demo.view.panels.BasePanel; +import org.apache.directory.triplesec.demo.view.panels.LoginPanel; +import org.apache.directory.triplesec.demo.view.pages.WapPushPage; import wicket.markup.html.basic.Label; import wicket.markup.html.form.Button; import wicket.markup.html.form.Form; Copied: directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java (from r559177, directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/WapPushPanel.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/WapPushPanel.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/WapPushPanel.java (original) +++ directory/triplesec/trunk/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo.view.panels; +package org.apache.directory.triplesec.demo.view.panels; import wicket.markup.html.link.Link; @@ -29,8 +29,9 @@ import wicket.model.CompoundPropertyModel; import wicket.model.Model; import wicket.util.parse.metapattern.MetaPattern; -import org.safehaus.triplesec.demo.view.pages.HomePage; -import org.safehaus.triplesec.demo.service.Registry; + +import org.apache.directory.triplesec.demo.service.Registry; +import org.apache.directory.triplesec.demo.view.pages.HomePage; import java.util.List; import java.util.Arrays; Copied: directory/triplesec/trunk/webapp-demo/src/test/java/org/apache/directory/demo/JdbcInvestmentsTest.java (from r559177, directory/triplesec/trunk/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/test/java/org/apache/directory/demo/JdbcInvestmentsTest.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/test/java/org/apache/directory/demo/JdbcInvestmentsTest.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java (original) +++ directory/triplesec/trunk/webapp-demo/src/test/java/org/apache/directory/demo/JdbcInvestmentsTest.java Tue Jul 24 12:52:22 2007 @@ -17,13 +17,13 @@ * under the License. * */ -package org.safehaus.demo; +package org.apache.directory.demo; import junit.framework.TestCase; import org.apache.derby.jdbc.EmbeddedDriver; -import org.safehaus.triplesec.demo.dao.InvestmentsDao; -import org.safehaus.triplesec.demo.dao.jdbc.JdbcInvestmentsDao; -import org.safehaus.triplesec.demo.model.Investments; +import org.apache.directory.triplesec.demo.dao.InvestmentsDao; +import org.apache.directory.triplesec.demo.model.Investments; +import org.apache.directory.triplesec.demo.dao.jdbc.JdbcInvestmentsDao; import java.sql.Connection; import java.sql.DriverManager; Copied: directory/triplesec/trunk/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java (from r559177, directory/triplesec/trunk/webapp-demo/src/test/java/org/safehaus/triplesec/demo/RunDemoUI.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-demo/src/test/java/org/safehaus/triplesec/demo/RunDemoUI.java&r1=559177&p2=directory/triplesec/trunk/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-demo/src/test/java/org/safehaus/triplesec/demo/RunDemoUI.java (original) +++ directory/triplesec/trunk/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.demo; +package org.apache.directory.triplesec.demo; import org.apache.directory.triplesec.integration.TriplesecIntegration; Copied: directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java (from r559177, directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/model/RegistrationInfo.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/model/RegistrationInfo.java&r1=559177&p2=directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/model/RegistrationInfo.java (original) +++ directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.registration.model; +package org.apache.directory.triplesec.registration.model; import java.io.Serializable; Copied: directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java (from r559009, directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationApplication.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationApplication.java&r1=559009&p2=directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationApplication.java (original) +++ directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.registration.view; +package org.apache.directory.triplesec.registration.view; import java.util.Properties; @@ -31,7 +31,7 @@ import org.apache.directory.triplesec.admin.dao.ldap.LdapDaoFactory; import org.apache.directory.triplesec.configuration.SmsConfiguration; import org.apache.directory.triplesec.configuration.SmtpConfiguration; -import org.safehaus.triplesec.registration.view.pages.WizardPage; +import org.apache.directory.triplesec.registration.view.pages.WizardPage; public class TriplesecRegistrationApplication extends WebApplication Copied: directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java (from r559009, directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationWizard.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationWizard.java&r1=559009&p2=directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationWizard.java (original) +++ directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.registration.view; +package org.apache.directory.triplesec.registration.view; import wicket.examples.wizard.ezwizard.impl.Wizard; @@ -27,7 +27,7 @@ import org.apache.directory.triplesec.admin.DataAccessException; import org.apache.directory.triplesec.admin.NoSuchEntryException; -import org.safehaus.triplesec.registration.model.RegistrationInfo; +import org.apache.directory.triplesec.registration.model.RegistrationInfo; /** Copied: directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/AppPageBorder.java (from r559177, directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/borders/AppPageBorder.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/AppPageBorder.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/borders/AppPageBorder.java&r1=559177&p2=directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/AppPageBorder.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/borders/AppPageBorder.java (original) +++ directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/AppPageBorder.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.registration.view.borders; +package org.apache.directory.triplesec.registration.view.borders; import wicket.markup.html.border.Border; Copied: directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/WizardPanelBorder.java (from r559177, directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/borders/WizardPanelBorder.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/WizardPanelBorder.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/borders/WizardPanelBorder.java&r1=559177&p2=directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/WizardPanelBorder.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/borders/WizardPanelBorder.java (original) +++ directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/WizardPanelBorder.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.registration.view.borders; +package org.apache.directory.triplesec.registration.view.borders; import wicket.markup.html.border.Border; Copied: directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/BasePage.java (from r559177, directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/pages/BasePage.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/BasePage.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/pages/BasePage.java&r1=559177&p2=directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/BasePage.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/pages/BasePage.java (original) +++ directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/BasePage.java Tue Jul 24 12:52:22 2007 @@ -17,12 +17,12 @@ * under the License. * */ -package org.safehaus.triplesec.registration.view.pages; +package org.apache.directory.triplesec.registration.view.pages; import wicket.markup.html.WebPage; import wicket.markup.html.border.Border; -import org.safehaus.triplesec.registration.view.borders.AppPageBorder; +import org.apache.directory.triplesec.registration.view.borders.AppPageBorder; public abstract class BasePage extends WebPage { Copied: directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java (from r559177, directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/pages/WizardPage.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/pages/WizardPage.java&r1=559177&p2=directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/pages/WizardPage.java (original) +++ directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java Tue Jul 24 12:52:22 2007 @@ -17,13 +17,13 @@ * under the License. * */ -package org.safehaus.triplesec.registration.view.pages; +package org.apache.directory.triplesec.registration.view.pages; -import org.safehaus.triplesec.registration.model.RegistrationInfo; -import org.safehaus.triplesec.registration.view.TriplesecRegistrationApplication; -import org.safehaus.triplesec.registration.view.TriplesecRegistrationWizard; -import org.safehaus.triplesec.registration.view.panels.*; +import org.apache.directory.triplesec.registration.model.RegistrationInfo; +import org.apache.directory.triplesec.registration.view.TriplesecRegistrationApplication; +import org.apache.directory.triplesec.registration.view.TriplesecRegistrationWizard; +import org.apache.directory.triplesec.registration.view.panels.*; import wicket.model.IModel; import wicket.model.CompoundPropertyModel; Copied: directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java (from r559177, directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanel.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanel.java&r1=559177&p2=directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanel.java (original) +++ directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.registration.view.panels; +package org.apache.directory.triplesec.registration.view.panels; import wicket.markup.html.panel.Panel; import wicket.markup.html.panel.FeedbackPanel; @@ -33,8 +33,8 @@ import java.util.Map; import java.util.Iterator; -import org.safehaus.triplesec.registration.view.borders.WizardPanelBorder; -import org.safehaus.triplesec.registration.view.pages.WizardPage; +import org.apache.directory.triplesec.registration.view.borders.WizardPanelBorder; +import org.apache.directory.triplesec.registration.view.pages.WizardPage; /** * Wizard steps are usually derived from a panel, and implement Copied: directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelAddress.java (from r559177, directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelAddress.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelAddress.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelAddress.java&r1=559177&p2=directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelAddress.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelAddress.java (original) +++ directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelAddress.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.registration.view.panels; +package org.apache.directory.triplesec.registration.view.panels; import java.util.Arrays; Copied: directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelDeploy.java (from r559177, directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelDeploy.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelDeploy.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelDeploy.java&r1=559177&p2=directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelDeploy.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelDeploy.java (original) +++ directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelDeploy.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.registration.view.panels; +package org.apache.directory.triplesec.registration.view.panels; import java.util.Arrays; Copied: directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelFinish.java (from r559177, directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java) URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelFinish.java?view=diff&rev=559180&p1=directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java&r1=559177&p2=directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelFinish.java&r2=559180 ============================================================================== --- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java (original) +++ directory/triplesec/trunk/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelFinish.java Tue Jul 24 12:52:22 2007 @@ -17,7 +17,7 @@ * under the License. * */ -package org.safehaus.triplesec.registration.view.panels; +package org.apache.directory.triplesec.registration.view.panels; import java.io.IOException; @@ -44,9 +44,10 @@ import org.apache.directory.triplesec.admin.TriplesecAdmin; import org.apache.directory.triplesec.configuration.SmsConfiguration; import org.apache.directory.triplesec.configuration.SmtpConfiguration; +import org.apache.directory.triplesec.registration.model.RegistrationInfo; +import org.apache.directory.triplesec.registration.view.TriplesecRegistrationApplication; import org.apache.directory.triplesec.sms.Carrier; -import org.safehaus.triplesec.registration.model.RegistrationInfo; -import org.safehaus.triplesec.registration.view.TriplesecRegistrationApplication; +import org.apache.directory.triplesec.registration.view.panels.WizardPanel; import com.sun.mail.smtp.SMTPTransport;