Author: vtence Date: Mon Jan 10 20:25:46 2005 New Revision: 124872 URL: http://svn.apache.org/viewcvs?view=rev&rev=124872 Log: Change package Janus name to Authx (authx for package and artifact names) Added: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/ - copied from r124867, incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/ - copied from r124867, incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/ - copied from r124867, incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/ incubator/directory/janus/trunk/example/src/java/org/apache/authx/ - copied from r124867, incubator/directory/janus/trunk/example/src/java/org/apache/janus/ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/ - copied from r124867, incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/ incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/ - copied from r124867, incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/ incubator/directory/janus/trunk/script/src/java/org/apache/authx/ - copied from r124867, incubator/directory/janus/trunk/script/src/java/org/apache/janus/ incubator/directory/janus/trunk/script/src/test/org/apache/authx/ - copied from r124867, incubator/directory/janus/trunk/script/src/test/org/apache/janus/ Removed: incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/ incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/ incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/ incubator/directory/janus/trunk/example/src/java/org/apache/janus/ incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/ incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/ incubator/directory/janus/trunk/script/src/java/org/apache/janus/ incubator/directory/janus/trunk/script/src/test/org/apache/janus/ Modified: incubator/directory/janus/trunk/core/api/project.xml incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/JanusException.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/AuthenticationException.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/Authenticator.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/Credential.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/CredentialSet.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/CyclicAssociationException.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/InformationProvider.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/MutableInformationProvider.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/IdentityInUseException.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/MutableRealm.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/Realm.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/UnsupportedCredentialsException.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Authorizer.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Effect.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Permission.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Rule.java incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/RuleSet.java incubator/directory/janus/trunk/core/impl/project.xml incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/AbstractPrincipal.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/DefaultAuthenticator.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/AttributePrincipal.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/AttributeProvider.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/GroupPrincipal.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/RolePrincipal.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/AuthenticationMethod.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/ContainsCredentialsMatcher.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/CredentialsMatcher.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/EqualMatcher.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/ExpressionBuilder.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/MemoryRealm.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/PasswordCredential.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/SameCredentialsBuilder.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/Selector.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/SelectorBuilder.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernameCredential.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernamePasswordAuthentication.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernamePrincipal.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/AbstractPermission.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/AccessPermission.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/BasicPermission.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/DefaultAuthorizer.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/DefaultRule.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/PermissionCollection.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/Policy.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/Predicate.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/PrimitiveRule.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/AbstractCombinedEffect.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/DenyEffect.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/DenyOverridesEffect.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/Effects.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/FirstApplicableEffect.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/GrantEffect.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/LastApplicableEffect.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/NotApplicableEffect.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/PermitOverridesEffect.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/AndPredicate.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/DependedUponPermissionPredicate.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/EqualPredicate.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/FalsePredicate.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/HasPrincipalPredicate.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/ImpliedPermissionPredicate.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/OrPredicate.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/Predicates.java incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/TruePredicate.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/DefaultAuthenticatorTest.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/attribute/AttributeProviderTest.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/AlwaysMatch.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/DummyCredential.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/MemoryRealmTest.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/NeverMatch.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/UsernamePasswordAuthenticationTest.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/CheckedPermission.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/DefaultAuthorizerTest.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/DefaultRuleTest.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/ExcludedPermission.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/FullPermission.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/PolicyTest.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/ReadPermission.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/SSNPrincipal.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/SomePermission.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/UncheckedPermission.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/DenyOverridesEffectTest.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/FirstApplicableEffectTest.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/LastApplicableEffectTest.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/PermitOverridesEffectTest.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Attributes.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Creds.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/FruitCredential.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/FruitPrincipal.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Fruits.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Groups.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Roles.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Subjects.java incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Usernames.java incubator/directory/janus/trunk/example/project.xml incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/CanPurchasePredicateBuilder.java incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/EnhancedNanoWebVelocityServlet.java incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/Item.java incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/PurchasePermission.java incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/SecurityContext.java incubator/directory/janus/trunk/example/src/webapp/WEB-INF/nanocontainer.groovy incubator/directory/janus/trunk/example/src/webapp/WEB-INF/web.xml incubator/directory/janus/trunk/example/src/webapp/catalog.vm incubator/directory/janus/trunk/example/src/webapp/denied.vm incubator/directory/janus/trunk/example/src/webapp/home.vm incubator/directory/janus/trunk/example/src/webapp/index.vm incubator/directory/janus/trunk/example/src/webapp/item_details.vm incubator/directory/janus/trunk/example/src/webapp/login.vm incubator/directory/janus/trunk/example/src/webapp/receipt.vm incubator/directory/janus/trunk/example/src/webapp/security.groovy incubator/directory/janus/trunk/example/src/webapp/shop.groovy incubator/directory/janus/trunk/example/src/webapp/try_again.vm incubator/directory/janus/trunk/jdbc/project.xml incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/AndExpression.java incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Column.java incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Converter.java incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/DefaultConverter.java incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/EqExpression.java incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/InstantiationException.java incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCException.java incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCRealm.java incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCSelector.java incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/SQLExpression.java incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/SQLExpressionBuilder.java incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Table.java incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Columns.java incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Creds.java incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/JDBCRealmTest.java incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/JDBCSelectorTest.java incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/MemoryDatabase.java incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/SameCredentialsBuilderTest.java incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Tables.java incubator/directory/janus/trunk/project.xml incubator/directory/janus/trunk/sandbox/project.xml incubator/directory/janus/trunk/script/project.xml incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/InformationProviderBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/InformationProviderBuilderMonitor.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/NullInformationProviderMonitor.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/NullRealmBuilderMonitor.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RealmBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RealmBuilderMonitor.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RuleSetBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/ScriptInterpretationException.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/ScriptingException.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/AbstractDom4JInformationProviderBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/BuildingContext.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JGroupBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRealmBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRoleBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRuleSetBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JUtils.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/ElementBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/ReverseBuildingContext.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AbstractElementBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AbstractRuleBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AndPredicateBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/DenyRuleBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/FalsePredicateBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/GrantRuleBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasGroupPredicateBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasRolePredicateBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasUsernamePredicateBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/LogicalPredicateBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/OrPredicateBuilder.java incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/TruePredicateBuilder.java incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/EyeColorPrincipal.java incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Groups.java incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Permissions.java incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Roles.java incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Subjects.java incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Usernames.java incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JGroupBuilderTest.java incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRealmBuilderTest.java incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRoleBuilderTest.java incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRuleSetBuilderTest.java incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/HasEyeColorPredicateBuilder.java incubator/directory/janus/trunk/xdocs/index.xml incubator/directory/janus/trunk/xdocs/navigation.xml incubator/directory/janus/trunk/xdocs/news.xml
Modified: incubator/directory/janus/trunk/core/api/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/project.xml?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/project.xml&r1=124871&p2=incubator/directory/janus/trunk/core/api/project.xml&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/project.xml (original) +++ incubator/directory/janus/trunk/core/api/project.xml Mon Jan 10 20:25:46 2005 @@ -2,14 +2,14 @@ <project> <extend>${basedir}/../../project.xml</extend> - <name>Janus API</name> - <id>janus-api</id> - <package>org.apache.janus</package> + <name>Apache Authentication and Authorization Framework API</name> + <id>authx-api</id> + <package>org.apache.authx</package> - <shortDescription>Janus API</shortDescription> + <shortDescription>Apache Authentication and Authorization Framework API</shortDescription> <description> - Janus Security Framework APIs + Apache Authentication and Authorization Framework APIs </description> <build> Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/JanusException.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/JanusException.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/JanusException.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/JanusException.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/JanusException.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/JanusException.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus; +package org.apache.authx; public abstract class JanusException extends RuntimeException { Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/AuthenticationException.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/AuthenticationException.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/AuthenticationException.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/AuthenticationException.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/AuthenticationException.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/AuthenticationException.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication; +package org.apache.authx.authentication; /** * /** Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/Authenticator.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/Authenticator.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/Authenticator.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/Authenticator.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/Authenticator.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/Authenticator.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication; +package org.apache.authx.authentication; import javax.security.auth.Subject; Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/Credential.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/Credential.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/Credential.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/Credential.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/Credential.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/Credential.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication; +package org.apache.authx.authentication; public interface Credential { Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/CredentialSet.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/CredentialSet.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/CredentialSet.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/CredentialSet.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/CredentialSet.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/CredentialSet.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication; +package org.apache.authx.authentication; import java.util.Collection; import java.util.Collections; Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/CyclicAssociationException.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/CyclicAssociationException.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/attribute/CyclicAssociationException.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/CyclicAssociationException.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/attribute/CyclicAssociationException.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/CyclicAssociationException.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.attribute; +package org.apache.authx.authentication.attribute; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/InformationProvider.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/InformationProvider.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/attribute/InformationProvider.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/InformationProvider.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/attribute/InformationProvider.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/InformationProvider.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.attribute; +package org.apache.authx.authentication.attribute; import javax.security.auth.Subject; Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/MutableInformationProvider.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/MutableInformationProvider.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/attribute/MutableInformationProvider.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/MutableInformationProvider.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/attribute/MutableInformationProvider.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/attribute/MutableInformationProvider.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.attribute; - -import org.apache.janus.authentication.attribute.InformationProvider; +package org.apache.authx.authentication.attribute; import java.security.Principal; import java.util.Collection; Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/IdentityInUseException.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/IdentityInUseException.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/realm/IdentityInUseException.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/IdentityInUseException.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/realm/IdentityInUseException.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/IdentityInUseException.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; - -import org.apache.janus.authentication.CredentialSet; +package org.apache.authx.authentication.realm; +import org.apache.authx.authentication.CredentialSet; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> */ Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/MutableRealm.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/MutableRealm.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/realm/MutableRealm.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/MutableRealm.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/realm/MutableRealm.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/MutableRealm.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/Realm.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/Realm.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/realm/Realm.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/Realm.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/realm/Realm.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/Realm.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/UnsupportedCredentialsException.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/UnsupportedCredentialsException.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/realm/UnsupportedCredentialsException.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/UnsupportedCredentialsException.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authentication/realm/UnsupportedCredentialsException.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authentication/realm/UnsupportedCredentialsException.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; public class UnsupportedCredentialsException extends IllegalArgumentException { Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Authorizer.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Authorizer.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authorization/Authorizer.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Authorizer.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authorization/Authorizer.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Authorizer.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; import javax.security.auth.Subject; Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Effect.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Effect.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authorization/Effect.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Effect.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authorization/Effect.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Effect.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Permission.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Permission.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authorization/Permission.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Permission.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authorization/Permission.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Permission.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Rule.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Rule.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authorization/Rule.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Rule.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authorization/Rule.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/Rule.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; import javax.security.auth.Subject; Modified: incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/RuleSet.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/RuleSet.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authorization/RuleSet.java&r1=124867&p2=incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/RuleSet.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/api/src/java/org/apache/janus/authorization/RuleSet.java (original) +++ incubator/directory/janus/trunk/core/api/src/java/org/apache/authx/authorization/RuleSet.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/project.xml?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/project.xml&r1=124871&p2=incubator/directory/janus/trunk/core/impl/project.xml&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/project.xml (original) +++ incubator/directory/janus/trunk/core/impl/project.xml Mon Jan 10 20:25:46 2005 @@ -2,22 +2,22 @@ <project> <extend>${basedir}/../../project.xml</extend> - <name>Janus Implementation</name> - <id>janus-impl</id> - <package>org.apache.janus</package> + <name>Apache Authentication and Authorization Framework Implementation</name> + <id>authx-impl</id> + <package>org.apache.authx</package> - <shortDescription>Janus Implementation</shortDescription> + <shortDescription>Apache Authentication and Authorization Framework Implementation</shortDescription> <description> - Implementation of the Janus Security Framework APIs + Implementation of the Apache Authentication and Authorization Framework APIs </description> <dependencies> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>janus-api</artifactId> + <artifactId>authx-api</artifactId> <version>${pom.currentVersion}</version> - </dependency> + </dependency> <!-- Test dependencies --> <dependency> <groupId>commons-collections</groupId> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/AbstractPrincipal.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/AbstractPrincipal.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/AbstractPrincipal.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/AbstractPrincipal.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/AbstractPrincipal.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/AbstractPrincipal.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication; +package org.apache.authx.authentication; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/DefaultAuthenticator.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/DefaultAuthenticator.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/DefaultAuthenticator.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/DefaultAuthenticator.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/DefaultAuthenticator.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/DefaultAuthenticator.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.authentication; +package org.apache.authx.authentication; -import org.apache.janus.authentication.attribute.InformationProvider; -import org.apache.janus.authentication.realm.Realm; +import org.apache.authx.authentication.attribute.InformationProvider; +import org.apache.authx.authentication.realm.Realm; import javax.security.auth.Subject; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/AttributePrincipal.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/AttributePrincipal.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/attribute/AttributePrincipal.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/AttributePrincipal.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/attribute/AttributePrincipal.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/AttributePrincipal.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.attribute; +package org.apache.authx.authentication.attribute; -import org.apache.janus.authentication.AbstractPrincipal; +import org.apache.authx.authentication.AbstractPrincipal; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/AttributeProvider.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/AttributeProvider.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/attribute/AttributeProvider.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/AttributeProvider.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/attribute/AttributeProvider.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/AttributeProvider.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.attribute; +package org.apache.authx.authentication.attribute; import javax.security.auth.Subject; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/GroupPrincipal.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/GroupPrincipal.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/attribute/GroupPrincipal.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/GroupPrincipal.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/attribute/GroupPrincipal.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/GroupPrincipal.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.attribute; +package org.apache.authx.authentication.attribute; -import org.apache.janus.authentication.AbstractPrincipal; +import org.apache.authx.authentication.AbstractPrincipal; import java.io.Serializable; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/RolePrincipal.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/RolePrincipal.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/attribute/RolePrincipal.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/RolePrincipal.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/attribute/RolePrincipal.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/attribute/RolePrincipal.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.attribute; +package org.apache.authx.authentication.attribute; -import org.apache.janus.authentication.AbstractPrincipal; +import org.apache.authx.authentication.AbstractPrincipal; import java.io.Serializable; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/AuthenticationMethod.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/AuthenticationMethod.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/AuthenticationMethod.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/AuthenticationMethod.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/AuthenticationMethod.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/AuthenticationMethod.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/ContainsCredentialsMatcher.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/ContainsCredentialsMatcher.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/ContainsCredentialsMatcher.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/ContainsCredentialsMatcher.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/ContainsCredentialsMatcher.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/ContainsCredentialsMatcher.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/CredentialsMatcher.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/CredentialsMatcher.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/CredentialsMatcher.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/CredentialsMatcher.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/CredentialsMatcher.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/CredentialsMatcher.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/EqualMatcher.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/EqualMatcher.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/EqualMatcher.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/EqualMatcher.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/EqualMatcher.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/EqualMatcher.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/ExpressionBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/ExpressionBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/ExpressionBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/ExpressionBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/ExpressionBuilder.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/ExpressionBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; public interface ExpressionBuilder { Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/MemoryRealm.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/MemoryRealm.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/MemoryRealm.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/MemoryRealm.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/MemoryRealm.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/MemoryRealm.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; import java.security.Principal; import java.util.ArrayList; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/PasswordCredential.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/PasswordCredential.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/PasswordCredential.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/PasswordCredential.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/PasswordCredential.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/PasswordCredential.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.Credential; +import org.apache.authx.authentication.Credential; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/SameCredentialsBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/SameCredentialsBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/SameCredentialsBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/SameCredentialsBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/SameCredentialsBuilder.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/SameCredentialsBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; -import org.apache.janus.authentication.Credential; +import org.apache.authx.authentication.CredentialSet; +import org.apache.authx.authentication.Credential; import java.util.Iterator; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/Selector.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/Selector.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/Selector.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/Selector.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/Selector.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/Selector.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; public interface Selector { Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/SelectorBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/SelectorBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/SelectorBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/SelectorBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/SelectorBuilder.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/SelectorBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; public interface SelectorBuilder { Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernameCredential.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernameCredential.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/UsernameCredential.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernameCredential.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/UsernameCredential.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernameCredential.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.Credential; +import org.apache.authx.authentication.Credential; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernamePasswordAuthentication.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernamePasswordAuthentication.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/UsernamePasswordAuthentication.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernamePasswordAuthentication.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/UsernamePasswordAuthentication.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernamePasswordAuthentication.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernamePrincipal.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernamePrincipal.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/UsernamePrincipal.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernamePrincipal.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authentication/realm/UsernamePrincipal.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authentication/realm/UsernamePrincipal.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.AbstractPrincipal; +import org.apache.authx.authentication.AbstractPrincipal; import java.io.Serializable; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/AbstractPermission.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/AbstractPermission.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/AbstractPermission.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/AbstractPermission.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/AbstractPermission.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/AbstractPermission.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/AccessPermission.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/AccessPermission.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/AccessPermission.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/AccessPermission.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/AccessPermission.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/AccessPermission.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/BasicPermission.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/BasicPermission.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/BasicPermission.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/BasicPermission.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/BasicPermission.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/BasicPermission.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/DefaultAuthorizer.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/DefaultAuthorizer.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/DefaultAuthorizer.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/DefaultAuthorizer.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/DefaultAuthorizer.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/DefaultAuthorizer.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; -import org.apache.janus.authorization.effect.Effects; +import org.apache.authx.authorization.effect.Effects; import javax.security.auth.Subject; import java.util.HashMap; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/DefaultRule.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/DefaultRule.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/DefaultRule.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/DefaultRule.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/DefaultRule.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/DefaultRule.java Mon Jan 10 20:25:46 2005 @@ -14,12 +14,12 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; -import org.apache.janus.authorization.effect.Effects; -import org.apache.janus.authorization.predicate.Predicates; -import org.apache.janus.authorization.predicate.AndPredicate; -import org.apache.janus.authorization.predicate.OrPredicate; +import org.apache.authx.authorization.effect.Effects; +import org.apache.authx.authorization.predicate.Predicates; +import org.apache.authx.authorization.predicate.AndPredicate; +import org.apache.authx.authorization.predicate.OrPredicate; import javax.security.auth.Subject; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/PermissionCollection.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/PermissionCollection.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/PermissionCollection.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/PermissionCollection.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/PermissionCollection.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/PermissionCollection.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; -import org.apache.janus.authorization.Permission; +import org.apache.authx.authorization.Permission; import java.util.Collection; import java.util.HashSet; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/Policy.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/Policy.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/Policy.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/Policy.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/Policy.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/Policy.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; import javax.security.auth.Subject; import java.util.ArrayList; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/Predicate.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/Predicate.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/Predicate.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/Predicate.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/Predicate.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/Predicate.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/PrimitiveRule.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/PrimitiveRule.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/PrimitiveRule.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/PrimitiveRule.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/PrimitiveRule.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/PrimitiveRule.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; import javax.security.auth.Subject; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/AbstractCombinedEffect.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/AbstractCombinedEffect.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/AbstractCombinedEffect.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/AbstractCombinedEffect.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/AbstractCombinedEffect.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/AbstractCombinedEffect.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; public abstract class AbstractCombinedEffect implements Effect { Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/DenyEffect.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/DenyEffect.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/DenyEffect.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/DenyEffect.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/DenyEffect.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/DenyEffect.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/DenyOverridesEffect.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/DenyOverridesEffect.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/DenyOverridesEffect.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/DenyOverridesEffect.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/DenyOverridesEffect.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/DenyOverridesEffect.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/Effects.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/Effects.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/Effects.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/Effects.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/Effects.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/Effects.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; public class Effects { Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/FirstApplicableEffect.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/FirstApplicableEffect.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/FirstApplicableEffect.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/FirstApplicableEffect.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/FirstApplicableEffect.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/FirstApplicableEffect.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/GrantEffect.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/GrantEffect.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/GrantEffect.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/GrantEffect.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/GrantEffect.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/GrantEffect.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/LastApplicableEffect.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/LastApplicableEffect.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/LastApplicableEffect.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/LastApplicableEffect.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/LastApplicableEffect.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/LastApplicableEffect.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/NotApplicableEffect.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/NotApplicableEffect.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/NotApplicableEffect.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/NotApplicableEffect.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/NotApplicableEffect.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/NotApplicableEffect.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/PermitOverridesEffect.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/PermitOverridesEffect.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/PermitOverridesEffect.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/PermitOverridesEffect.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/effect/PermitOverridesEffect.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/effect/PermitOverridesEffect.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/AndPredicate.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/AndPredicate.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/AndPredicate.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/AndPredicate.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/AndPredicate.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/AndPredicate.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.predicate; +package org.apache.authx.authorization.predicate; -import org.apache.janus.authorization.Predicate; +import org.apache.authx.authorization.Predicate; public class AndPredicate implements Predicate { Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/DependedUponPermissionPredicate.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/DependedUponPermissionPredicate.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/DependedUponPermissionPredicate.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/DependedUponPermissionPredicate.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/DependedUponPermissionPredicate.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/DependedUponPermissionPredicate.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.authorization.predicate; +package org.apache.authx.authorization.predicate; -import org.apache.janus.authorization.Permission; -import org.apache.janus.authorization.Predicate; +import org.apache.authx.authorization.Permission; +import org.apache.authx.authorization.Predicate; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/EqualPredicate.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/EqualPredicate.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/EqualPredicate.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/EqualPredicate.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/EqualPredicate.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/EqualPredicate.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.predicate; +package org.apache.authx.authorization.predicate; -import org.apache.janus.authorization.Predicate; +import org.apache.authx.authorization.Predicate; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/FalsePredicate.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/FalsePredicate.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/FalsePredicate.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/FalsePredicate.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/FalsePredicate.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/FalsePredicate.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.predicate; +package org.apache.authx.authorization.predicate; -import org.apache.janus.authorization.Predicate; +import org.apache.authx.authorization.Predicate; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/HasPrincipalPredicate.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/HasPrincipalPredicate.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/HasPrincipalPredicate.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/HasPrincipalPredicate.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/HasPrincipalPredicate.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/HasPrincipalPredicate.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.predicate; +package org.apache.authx.authorization.predicate; -import org.apache.janus.authorization.Predicate; +import org.apache.authx.authorization.Predicate; import javax.security.auth.Subject; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/ImpliedPermissionPredicate.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/ImpliedPermissionPredicate.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/ImpliedPermissionPredicate.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/ImpliedPermissionPredicate.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/ImpliedPermissionPredicate.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/ImpliedPermissionPredicate.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.authorization.predicate; +package org.apache.authx.authorization.predicate; -import org.apache.janus.authorization.Permission; -import org.apache.janus.authorization.Predicate; +import org.apache.authx.authorization.Permission; +import org.apache.authx.authorization.Predicate; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/OrPredicate.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/OrPredicate.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/OrPredicate.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/OrPredicate.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/OrPredicate.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/OrPredicate.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.predicate; +package org.apache.authx.authorization.predicate; -import org.apache.janus.authorization.Predicate; +import org.apache.authx.authorization.Predicate; public class OrPredicate implements Predicate { Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/Predicates.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/Predicates.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/Predicates.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/Predicates.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/Predicates.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/Predicates.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.authorization.predicate; +package org.apache.authx.authorization.predicate; -import org.apache.janus.authorization.Permission; -import org.apache.janus.authorization.Predicate; +import org.apache.authx.authorization.Permission; +import org.apache.authx.authorization.Predicate; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/TruePredicate.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/TruePredicate.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/TruePredicate.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/TruePredicate.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/java/org/apache/janus/authorization/predicate/TruePredicate.java (original) +++ incubator/directory/janus/trunk/core/impl/src/java/org/apache/authx/authorization/predicate/TruePredicate.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.predicate; +package org.apache.authx.authorization.predicate; -import org.apache.janus.authorization.Predicate; +import org.apache.authx.authorization.Predicate; /** * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Tence</a> Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/DefaultAuthenticatorTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/DefaultAuthenticatorTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/DefaultAuthenticatorTest.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/DefaultAuthenticatorTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/DefaultAuthenticatorTest.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/DefaultAuthenticatorTest.java Mon Jan 10 20:25:46 2005 @@ -14,15 +14,15 @@ * limitations under the License. * */ -package org.apache.janus.authentication; +package org.apache.authx.authentication; import org.apache.commons.collections.CollectionUtils; -import org.apache.janus.authentication.attribute.AttributeProvider; -import org.apache.janus.authentication.realm.Realm; -import org.apache.janus.testmodel.Attributes; -import org.apache.janus.testmodel.Creds; -import org.apache.janus.testmodel.Fruits; -import org.apache.janus.testmodel.Groups; +import org.apache.authx.authentication.attribute.AttributeProvider; +import org.apache.authx.authentication.realm.Realm; +import org.apache.authx.testmodel.Attributes; +import org.apache.authx.testmodel.Creds; +import org.apache.authx.testmodel.Fruits; +import org.apache.authx.testmodel.Groups; import org.jmock.Mock; import org.jmock.MockObjectTestCase; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/attribute/AttributeProviderTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/attribute/AttributeProviderTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/attribute/AttributeProviderTest.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/attribute/AttributeProviderTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/attribute/AttributeProviderTest.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/attribute/AttributeProviderTest.java Mon Jan 10 20:25:46 2005 @@ -14,13 +14,13 @@ * limitations under the License. * */ -package org.apache.janus.authentication.attribute; +package org.apache.authx.authentication.attribute; import junit.framework.TestCase; import org.apache.commons.collections.CollectionUtils; -import org.apache.janus.testmodel.Groups; -import org.apache.janus.testmodel.Subjects; -import org.apache.janus.testmodel.Usernames; +import org.apache.authx.testmodel.Groups; +import org.apache.authx.testmodel.Subjects; +import org.apache.authx.testmodel.Usernames; import javax.security.auth.Subject; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/AlwaysMatch.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/AlwaysMatch.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/realm/AlwaysMatch.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/AlwaysMatch.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/realm/AlwaysMatch.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/AlwaysMatch.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/DummyCredential.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/DummyCredential.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/realm/DummyCredential.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/DummyCredential.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/realm/DummyCredential.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/DummyCredential.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; import java.io.Serializable; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/MemoryRealmTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/MemoryRealmTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/realm/MemoryRealmTest.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/MemoryRealmTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/realm/MemoryRealmTest.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/MemoryRealmTest.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; import org.jmock.MockObjectTestCase; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/NeverMatch.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/NeverMatch.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/realm/NeverMatch.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/NeverMatch.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/realm/NeverMatch.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/NeverMatch.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/UsernamePasswordAuthenticationTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/UsernamePasswordAuthenticationTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/realm/UsernamePasswordAuthenticationTest.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/UsernamePasswordAuthenticationTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authentication/realm/UsernamePasswordAuthenticationTest.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authentication/realm/UsernamePasswordAuthenticationTest.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; import junit.framework.TestCase; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; import java.util.Collections; import java.util.HashSet; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/CheckedPermission.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/CheckedPermission.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/CheckedPermission.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/CheckedPermission.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/CheckedPermission.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/CheckedPermission.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/DefaultAuthorizerTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/DefaultAuthorizerTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/DefaultAuthorizerTest.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/DefaultAuthorizerTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/DefaultAuthorizerTest.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/DefaultAuthorizerTest.java Mon Jan 10 20:25:46 2005 @@ -14,11 +14,11 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; import junit.framework.TestCase; -import org.apache.janus.authorization.effect.Effects; -import org.apache.janus.authorization.effect.PermitOverridesEffect; +import org.apache.authx.authorization.effect.Effects; +import org.apache.authx.authorization.effect.PermitOverridesEffect; import javax.security.auth.Subject; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/DefaultRuleTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/DefaultRuleTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/DefaultRuleTest.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/DefaultRuleTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/DefaultRuleTest.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/DefaultRuleTest.java Mon Jan 10 20:25:46 2005 @@ -14,15 +14,15 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; -import org.apache.janus.authorization.effect.Effects; -import org.apache.janus.authorization.predicate.FalsePredicate; -import org.apache.janus.authorization.predicate.HasPrincipalPredicate; -import org.apache.janus.authorization.predicate.ImpliedPermissionPredicate; -import org.apache.janus.authorization.predicate.TruePredicate; -import org.apache.janus.testmodel.Subjects; -import org.apache.janus.testmodel.Usernames; +import org.apache.authx.authorization.effect.Effects; +import org.apache.authx.authorization.predicate.FalsePredicate; +import org.apache.authx.authorization.predicate.HasPrincipalPredicate; +import org.apache.authx.authorization.predicate.ImpliedPermissionPredicate; +import org.apache.authx.authorization.predicate.TruePredicate; +import org.apache.authx.testmodel.Subjects; +import org.apache.authx.testmodel.Usernames; import org.jmock.MockObjectTestCase; /** Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/ExcludedPermission.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/ExcludedPermission.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/ExcludedPermission.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/ExcludedPermission.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/ExcludedPermission.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/ExcludedPermission.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/FullPermission.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/FullPermission.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/FullPermission.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/FullPermission.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/FullPermission.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/FullPermission.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; -import org.apache.janus.authorization.BasicPermission; -import org.apache.janus.authorization.Permission; +import org.apache.authx.authorization.BasicPermission; +import org.apache.authx.authorization.Permission; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/PolicyTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/PolicyTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/PolicyTest.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/PolicyTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/PolicyTest.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/PolicyTest.java Mon Jan 10 20:25:46 2005 @@ -14,11 +14,11 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; import junit.framework.TestCase; -import org.apache.janus.authorization.effect.Effects; -import org.apache.janus.authorization.effect.PermitOverridesEffect; +import org.apache.authx.authorization.effect.Effects; +import org.apache.authx.authorization.effect.PermitOverridesEffect; import javax.security.auth.Subject; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/ReadPermission.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/ReadPermission.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/ReadPermission.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/ReadPermission.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/ReadPermission.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/ReadPermission.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; -import org.apache.janus.authorization.BasicPermission; -import org.apache.janus.authorization.Permission; +import org.apache.authx.authorization.BasicPermission; +import org.apache.authx.authorization.Permission; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/SSNPrincipal.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/SSNPrincipal.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/SSNPrincipal.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/SSNPrincipal.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/SSNPrincipal.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/SSNPrincipal.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; -import org.apache.janus.authentication.AbstractPrincipal; -import org.apache.janus.authentication.AbstractPrincipal; +import org.apache.authx.authentication.AbstractPrincipal; +import org.apache.authx.authentication.AbstractPrincipal; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/SomePermission.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/SomePermission.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/SomePermission.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/SomePermission.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/SomePermission.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/SomePermission.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; public class SomePermission extends BasicPermission { Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/UncheckedPermission.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/UncheckedPermission.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/UncheckedPermission.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/UncheckedPermission.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/UncheckedPermission.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/UncheckedPermission.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authorization; +package org.apache.authx.authorization; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/DenyOverridesEffectTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/DenyOverridesEffectTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/effect/DenyOverridesEffectTest.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/DenyOverridesEffectTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/effect/DenyOverridesEffectTest.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/DenyOverridesEffectTest.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; import org.jmock.MockObjectTestCase; public class DenyOverridesEffectTest extends MockObjectTestCase Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/FirstApplicableEffectTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/FirstApplicableEffectTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/effect/FirstApplicableEffectTest.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/FirstApplicableEffectTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/effect/FirstApplicableEffectTest.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/FirstApplicableEffectTest.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; import org.jmock.MockObjectTestCase; public class FirstApplicableEffectTest extends MockObjectTestCase Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/LastApplicableEffectTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/LastApplicableEffectTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/effect/LastApplicableEffectTest.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/LastApplicableEffectTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/effect/LastApplicableEffectTest.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/LastApplicableEffectTest.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; import org.jmock.MockObjectTestCase; public class LastApplicableEffectTest extends MockObjectTestCase Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/PermitOverridesEffectTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/PermitOverridesEffectTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/effect/PermitOverridesEffectTest.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/PermitOverridesEffectTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/authorization/effect/PermitOverridesEffectTest.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/authorization/effect/PermitOverridesEffectTest.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authorization.effect; +package org.apache.authx.authorization.effect; -import org.apache.janus.authorization.Effect; +import org.apache.authx.authorization.Effect; import org.jmock.MockObjectTestCase; public class PermitOverridesEffectTest extends MockObjectTestCase Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Attributes.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Attributes.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Attributes.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Attributes.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Attributes.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Attributes.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.testmodel; +package org.apache.authx.testmodel; -import org.apache.janus.authentication.attribute.AttributePrincipal; +import org.apache.authx.authentication.attribute.AttributePrincipal; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Creds.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Creds.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Creds.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Creds.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Creds.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Creds.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.testmodel; +package org.apache.authx.testmodel; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; public class Creds { Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/FruitCredential.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/FruitCredential.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/FruitCredential.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/FruitCredential.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/FruitCredential.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/FruitCredential.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.testmodel; +package org.apache.authx.testmodel; import java.io.Serializable; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/FruitPrincipal.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/FruitPrincipal.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/FruitPrincipal.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/FruitPrincipal.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/FruitPrincipal.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/FruitPrincipal.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.testmodel; +package org.apache.authx.testmodel; -import org.apache.janus.authentication.AbstractPrincipal; +import org.apache.authx.authentication.AbstractPrincipal; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Fruits.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Fruits.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Fruits.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Fruits.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Fruits.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Fruits.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.testmodel; +package org.apache.authx.testmodel; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Groups.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Groups.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Groups.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Groups.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Groups.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Groups.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.testmodel; +package org.apache.authx.testmodel; -import org.apache.janus.authentication.attribute.GroupPrincipal; +import org.apache.authx.authentication.attribute.GroupPrincipal; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Roles.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Roles.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Roles.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Roles.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Roles.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Roles.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.testmodel; +package org.apache.authx.testmodel; -import org.apache.janus.authentication.attribute.RolePrincipal; +import org.apache.authx.authentication.attribute.RolePrincipal; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Subjects.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Subjects.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Subjects.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Subjects.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Subjects.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Subjects.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.testmodel; +package org.apache.authx.testmodel; import javax.security.auth.Subject; import java.security.Principal; Modified: incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Usernames.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Usernames.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Usernames.java&r1=124867&p2=incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Usernames.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/core/impl/src/test/org/apache/janus/testmodel/Usernames.java (original) +++ incubator/directory/janus/trunk/core/impl/src/test/org/apache/authx/testmodel/Usernames.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.testmodel; +package org.apache.authx.testmodel; -import org.apache.janus.authentication.realm.UsernamePrincipal; +import org.apache.authx.authentication.realm.UsernamePrincipal; public class Usernames { Modified: incubator/directory/janus/trunk/example/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/project.xml?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/project.xml&r1=124871&p2=incubator/directory/janus/trunk/example/project.xml&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/project.xml (original) +++ incubator/directory/janus/trunk/example/project.xml Mon Jan 10 20:25:46 2005 @@ -2,20 +2,20 @@ <project> <extend>${basedir}/../project.xml</extend> - <name>Janus Demo Application</name> - <id>janus-example</id> - <package>org.apache.janus</package> + <name>Apache Authentication and Authorization Framework Demo Application</name> + <id>authx-example</id> + <package>org.apache.authx</package> - <shortDescription>Janus Demo Application</shortDescription> + <shortDescription>Apache Authentication and Authorization Framework Demo Application</shortDescription> <description> - Demonstration Application of the Janus Security Framework + Demonstration Application of the Apache Authentication and Authorization Framework </description> <dependencies> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>janus-api</artifactId> + <artifactId>authx-api</artifactId> <version>${pom.currentVersion}</version> <properties> <war.bundle>true</war.bundle> @@ -23,7 +23,7 @@ </dependency> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>janus-impl</artifactId> + <artifactId>authx-impl</artifactId> <version>${pom.currentVersion}</version> <properties> <war.bundle>true</war.bundle> @@ -31,7 +31,7 @@ </dependency> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>janus-script</artifactId> + <artifactId>authx-script</artifactId> <version>${pom.currentVersion}</version> <properties> <war.bundle>true</war.bundle> Modified: incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/CanPurchasePredicateBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/CanPurchasePredicateBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/java/org/apache/janus/example/web/CanPurchasePredicateBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/CanPurchasePredicateBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/java/org/apache/janus/example/web/CanPurchasePredicateBuilder.java (original) +++ incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/CanPurchasePredicateBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.example.web; +package org.apache.authx.example.web; -import org.apache.janus.script.xml.builder.AbstractElementBuilder; -import org.apache.janus.authorization.predicate.ImpliedPermissionPredicate; +import org.apache.authx.script.xml.builder.AbstractElementBuilder; +import org.apache.authx.authorization.predicate.ImpliedPermissionPredicate; import org.dom4j.Element; public class CanPurchasePredicateBuilder extends AbstractElementBuilder Modified: incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/EnhancedNanoWebVelocityServlet.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/EnhancedNanoWebVelocityServlet.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/java/org/apache/janus/example/web/EnhancedNanoWebVelocityServlet.java&r1=124867&p2=incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/EnhancedNanoWebVelocityServlet.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/java/org/apache/janus/example/web/EnhancedNanoWebVelocityServlet.java (original) +++ incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/EnhancedNanoWebVelocityServlet.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.example.web; +package org.apache.authx.example.web; import org.apache.velocity.Template; import org.apache.velocity.context.Context; Modified: incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/Item.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/Item.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/java/org/apache/janus/example/web/Item.java&r1=124867&p2=incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/Item.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/java/org/apache/janus/example/web/Item.java (original) +++ incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/Item.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.example.web; +package org.apache.authx.example.web; public class Item { Modified: incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/PurchasePermission.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/PurchasePermission.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/java/org/apache/janus/example/web/PurchasePermission.java&r1=124867&p2=incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/PurchasePermission.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/java/org/apache/janus/example/web/PurchasePermission.java (original) +++ incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/PurchasePermission.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.example.web; +package org.apache.authx.example.web; -import org.apache.janus.authorization.BasicPermission; -import org.apache.janus.authorization.Permission; +import org.apache.authx.authorization.BasicPermission; +import org.apache.authx.authorization.Permission; public class PurchasePermission extends BasicPermission { Modified: incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/SecurityContext.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/SecurityContext.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/java/org/apache/janus/example/web/SecurityContext.java&r1=124867&p2=incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/SecurityContext.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/java/org/apache/janus/example/web/SecurityContext.java (original) +++ incubator/directory/janus/trunk/example/src/java/org/apache/authx/example/web/SecurityContext.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.example.web; +package org.apache.authx.example.web; -import org.apache.janus.authentication.realm.UsernamePrincipal; +import org.apache.authx.authentication.realm.UsernamePrincipal; import javax.security.auth.Subject; import java.io.Serializable; Modified: incubator/directory/janus/trunk/example/src/webapp/WEB-INF/nanocontainer.groovy Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/WEB-INF/nanocontainer.groovy?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/WEB-INF/nanocontainer.groovy&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/WEB-INF/nanocontainer.groovy&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/WEB-INF/nanocontainer.groovy (original) +++ incubator/directory/janus/trunk/example/src/webapp/WEB-INF/nanocontainer.groovy Mon Jan 10 20:25:46 2005 @@ -2,37 +2,37 @@ if ( assemblyScope instanceof javax.servlet.ServletContext ) { - realm = new org.apache.janus.authentication.realm.MemoryRealm() + realm = new org.apache.authx.authentication.realm.MemoryRealm() // A nasty groovy bug prevents us from using servlet context to get the file real path // See http://jira.codehaus.org/browse/GROOVY-210 - users = new java.io.FileReader( "c:/tools/jakarta-tomcat-5.0.28/webapps/janus-example/WEB-INF/users.xml" ) - realmBuilder = org.apache.janus.script.xml.Dom4JRealmBuilder.fromReader( users ) + users = new java.io.FileReader( "c:/tools/jakarta-tomcat-5.0.28/webapps/authx-example/WEB-INF/users.xml" ) + realmBuilder = org.apache.authx.script.xml.Dom4JRealmBuilder.fromReader( users ) realmBuilder.buildRealm( realm ) - authenticator = new org.apache.janus.authentication.DefaultAuthenticator( realm ) + authenticator = new org.apache.authx.authentication.DefaultAuthenticator( realm ) - roleProvider = new org.apache.janus.authentication.attribute.AttributeProvider() - roles = new java.io.FileReader( "c:/tools/jakarta-tomcat-5.0.28/webapps/janus-example/WEB-INF/roles.xml" ) - roleBuilder = org.apache.janus.script.xml.Dom4JRoleBuilder.fromReader( roles ) + roleProvider = new org.apache.authx.authentication.attribute.AttributeProvider() + roles = new java.io.FileReader( "c:/tools/jakarta-tomcat-5.0.28/webapps/authx-example/WEB-INF/roles.xml" ) + roleBuilder = org.apache.authx.script.xml.Dom4JRoleBuilder.fromReader( roles ) roleBuilder.buildProvider( roleProvider ) authenticator.addInformationProvider( roleProvider ) - pico.registerComponentInstance( org.apache.janus.authentication.Authenticator, authenticator ) + pico.registerComponentInstance( org.apache.authx.authentication.Authenticator, authenticator ) - policy = new org.apache.janus.authorization.Policy( new org.apache.janus.authorization.effect.PermitOverridesEffect() ) - permissions = new java.io.FileReader( "c:/tools/jakarta-tomcat-5.0.28/webapps/janus-example/WEB-INF/permissions.xml" ) - policyBuilder = org.apache.janus.script.xml.Dom4JRuleSetBuilder.fromReader( permissions ) - policyBuilder.registerBuilder( new org.apache.janus.example.web.CanPurchasePredicateBuilder() ) + policy = new org.apache.authx.authorization.Policy( new org.apache.authx.authorization.effect.PermitOverridesEffect() ) + permissions = new java.io.FileReader( "c:/tools/jakarta-tomcat-5.0.28/webapps/authx-example/WEB-INF/permissions.xml" ) + policyBuilder = org.apache.authx.script.xml.Dom4JRuleSetBuilder.fromReader( permissions ) + policyBuilder.registerBuilder( new org.apache.authx.example.web.CanPurchasePredicateBuilder() ) policyBuilder.buildRuleSet( policy ) - authorizer = new org.apache.janus.authorization.DefaultAuthorizer( policy ); - authorizer.denyOn( org.apache.janus.authorization.effect.Effects.NOT_APPLICABLE ); - pico.registerComponentInstance( org.apache.janus.authorization.Authorizer, authorizer ) + authorizer = new org.apache.authx.authorization.DefaultAuthorizer( policy ); + authorizer.denyOn( org.apache.authx.authorization.effect.Effects.NOT_APPLICABLE ); + pico.registerComponentInstance( org.apache.authx.authorization.Authorizer, authorizer ) } else if ( assemblyScope instanceof javax.servlet.http.HttpSession ) { // Session level components - pico.registerComponentImplementation( org.apache.janus.example.web.SecurityContext ) + pico.registerComponentImplementation( org.apache.authx.example.web.SecurityContext ) } else if ( assemblyScope instanceof javax.servlet.ServletRequest ) { Modified: incubator/directory/janus/trunk/example/src/webapp/WEB-INF/web.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/WEB-INF/web.xml?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/WEB-INF/web.xml&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/WEB-INF/web.xml&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/WEB-INF/web.xml (original) +++ incubator/directory/janus/trunk/example/src/webapp/WEB-INF/web.xml Mon Jan 10 20:25:46 2005 @@ -2,7 +2,7 @@ <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";> <web-app> - <display-name>Janus Demo</display-name> + <display-name>Apache Authentication and Authorization Framework Demo</display-name> <context-param> <param-name>nanocontainer.groovy</param-name> @@ -25,7 +25,7 @@ <servlet> <servlet-name>NanoVelocity</servlet-name> - <servlet-class>org.apache.janus.example.web.EnhancedNanoWebVelocityServlet</servlet-class> + <servlet-class>org.apache.authx.example.web.EnhancedNanoWebVelocityServlet</servlet-class> <!-- <init-param> <param-name>org.apache.velocity.toolbox</param-name> Modified: incubator/directory/janus/trunk/example/src/webapp/catalog.vm Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/catalog.vm?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/catalog.vm&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/catalog.vm&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/catalog.vm (original) +++ incubator/directory/janus/trunk/example/src/webapp/catalog.vm Mon Jan 10 20:25:46 2005 @@ -1,6 +1,6 @@ <html> <head> - <title>Janus Demo Application</title> + <title>JanuApache Authentication and Authorization Framework Demo Application</title> </head> <body> Modified: incubator/directory/janus/trunk/example/src/webapp/denied.vm Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/denied.vm?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/denied.vm&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/denied.vm&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/denied.vm (original) +++ incubator/directory/janus/trunk/example/src/webapp/denied.vm Mon Jan 10 20:25:46 2005 @@ -1,6 +1,6 @@ <html> <head> - <title>Janus Demo Application</title> + <title>Apache Authentication and Authorization Framework Demo Application</title> </head> <body> This is too expensive for you $action.username! <a href="list.groovy">Choose something cheaper</a> Modified: incubator/directory/janus/trunk/example/src/webapp/home.vm Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/home.vm?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/home.vm&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/home.vm&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/home.vm (original) +++ incubator/directory/janus/trunk/example/src/webapp/home.vm Mon Jan 10 20:25:46 2005 @@ -1,6 +1,6 @@ <html> <head> - <title>Janus Demo Application</title> + <title>Apache Authentication and Authorization Framework Demo Application</title> </head> <body> Welcome! Modified: incubator/directory/janus/trunk/example/src/webapp/index.vm Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/index.vm?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/index.vm&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/index.vm&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/index.vm (original) +++ incubator/directory/janus/trunk/example/src/webapp/index.vm Mon Jan 10 20:25:46 2005 @@ -1,6 +1,6 @@ <html> <head> - <title>Janus Demo Application</title> + <title>Apache Authentication and Authorization Framework Demo Application</title> </head> <body> <a href="$root/security/login.groovy">Login</a> Modified: incubator/directory/janus/trunk/example/src/webapp/item_details.vm Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/item_details.vm?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/item_details.vm&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/item_details.vm&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/item_details.vm (original) +++ incubator/directory/janus/trunk/example/src/webapp/item_details.vm Mon Jan 10 20:25:46 2005 @@ -1,6 +1,6 @@ <html> <head> - <title>Janus Demo Application</title> + <title>Apache Authentication and Authorization Framework Demo Application</title> </head> <body> Modified: incubator/directory/janus/trunk/example/src/webapp/login.vm Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/login.vm?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/login.vm&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/login.vm&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/login.vm (original) +++ incubator/directory/janus/trunk/example/src/webapp/login.vm Mon Jan 10 20:25:46 2005 @@ -1,6 +1,6 @@ <html> <head> - <title>Janus Demo Application</title> + <title>Apache Authentication and Authorization Framework Demo Application</title> </head> <body> <form method="POST" action="authenticate.groovy"> Modified: incubator/directory/janus/trunk/example/src/webapp/receipt.vm Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/receipt.vm?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/receipt.vm&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/receipt.vm&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/receipt.vm (original) +++ incubator/directory/janus/trunk/example/src/webapp/receipt.vm Mon Jan 10 20:25:46 2005 @@ -1,6 +1,6 @@ <html> <head> - <title>Janus Demo Application</title> + <title>Apache Authentication and Authorization Framework Demo Application</title> </head> <body> Thanks $action.username for shopping with us. <a href="list.groovy">Buy something else</a> Modified: incubator/directory/janus/trunk/example/src/webapp/security.groovy Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/security.groovy?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/security.groovy&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/security.groovy&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/security.groovy (original) +++ incubator/directory/janus/trunk/example/src/webapp/security.groovy Mon Jan 10 20:25:46 2005 @@ -1,10 +1,10 @@ import javax.security.auth.Subject -import org.apache.janus.authentication.Authenticator -import org.apache.janus.authentication.CredentialSet -import org.apache.janus.authentication.realm.UsernameCredential -import org.apache.janus.authentication.realm.PasswordCredential -import org.apache.janus.example.web.SecurityContext +import org.apache.authx.authentication.Authenticator +import org.apache.authx.authentication.CredentialSet +import org.apache.authx.authentication.realm.UsernameCredential +import org.apache.authx.authentication.realm.PasswordCredential +import org.apache.authx.example.web.SecurityContext class Security { Modified: incubator/directory/janus/trunk/example/src/webapp/shop.groovy Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/shop.groovy?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/shop.groovy&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/shop.groovy&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/shop.groovy (original) +++ incubator/directory/janus/trunk/example/src/webapp/shop.groovy Mon Jan 10 20:25:46 2005 @@ -1,7 +1,7 @@ -import org.apache.janus.example.web.Item -import org.apache.janus.example.web.PurchasePermission -import org.apache.janus.authorization.Authorizer -import org.apache.janus.example.web.SecurityContext +import org.apache.authx.example.web.Item +import org.apache.authx.example.web.PurchasePermission +import org.apache.authx.authorization.Authorizer +import org.apache.authx.example.web.SecurityContext class Shop { Modified: incubator/directory/janus/trunk/example/src/webapp/try_again.vm Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/example/src/webapp/try_again.vm?view=diff&rev=124872&p1=incubator/directory/janus/trunk/example/src/webapp/try_again.vm&r1=124871&p2=incubator/directory/janus/trunk/example/src/webapp/try_again.vm&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/example/src/webapp/try_again.vm (original) +++ incubator/directory/janus/trunk/example/src/webapp/try_again.vm Mon Jan 10 20:25:46 2005 @@ -1,6 +1,6 @@ <html> <head> - <title>Janus Demo Application</title> + <title>Apache Authentication and Authorization Framework Demo Application</title> </head> <body> Are you sure you're $action.username? <a href="authenticate.groovy">Try again</a> Modified: incubator/directory/janus/trunk/jdbc/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/project.xml?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/project.xml&r1=124871&p2=incubator/directory/janus/trunk/jdbc/project.xml&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/project.xml (original) +++ incubator/directory/janus/trunk/jdbc/project.xml Mon Jan 10 20:25:46 2005 @@ -2,25 +2,25 @@ <project> <extend>${basedir}/../project.xml</extend> - <name>Janus JBDC Implementation</name> - <id>janus-jdbc</id> - <package>org.apache.janus</package> + <name>Apache Authentication and Authorization Framework JBDC Implementation</name> + <id>authx-jdbc</id> + <package>org.apache.authx</package> - <shortDescription>JDBC implementation of Janus core components</shortDescription> + <shortDescription>JDBC implementation of Apache Authentication and Authorization Framework core components</shortDescription> <description> - JDBC implementation of Janus core components + JDBC implementation of Apache Authentication and Authorization Framework core components </description> <dependencies> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>janus-api</artifactId> + <artifactId>authx-api</artifactId> <version>${pom.currentVersion}</version> </dependency> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>janus-impl</artifactId> + <artifactId>authx-impl</artifactId> <version>${pom.currentVersion}</version> </dependency> <dependency> Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/AndExpression.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/AndExpression.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/AndExpression.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/AndExpression.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/AndExpression.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/AndExpression.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; import java.util.Collection; Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Column.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Column.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/Column.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Column.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/Column.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Column.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.Credential; +import org.apache.authx.authentication.Credential; import java.sql.ResultSet; import java.sql.SQLException; Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Converter.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Converter.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/Converter.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Converter.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/Converter.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Converter.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; public interface Converter { Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/DefaultConverter.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/DefaultConverter.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/DefaultConverter.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/DefaultConverter.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/DefaultConverter.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/DefaultConverter.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; public class DefaultConverter implements Converter { Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/EqExpression.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/EqExpression.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/EqExpression.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/EqExpression.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/EqExpression.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/EqExpression.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; import java.util.Collection; Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/InstantiationException.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/InstantiationException.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/InstantiationException.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/InstantiationException.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/InstantiationException.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/InstantiationException.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; public class InstantiationException extends RuntimeException { Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCException.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCException.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/JDBCException.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCException.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/JDBCException.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCException.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; import java.sql.SQLException; Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCRealm.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCRealm.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/JDBCRealm.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCRealm.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/JDBCRealm.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCRealm.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; import javax.sql.DataSource; import java.security.Principal; Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCSelector.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCSelector.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/JDBCSelector.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCSelector.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/JDBCSelector.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/JDBCSelector.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; import java.sql.Connection; import java.sql.PreparedStatement; Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/SQLExpression.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/SQLExpression.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/SQLExpression.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/SQLExpression.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/SQLExpression.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/SQLExpression.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; import java.util.Collection; Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/SQLExpressionBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/SQLExpressionBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/SQLExpressionBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/SQLExpressionBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/SQLExpressionBuilder.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/SQLExpressionBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; public class SQLExpressionBuilder implements ExpressionBuilder { Modified: incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Table.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Table.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/Table.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Table.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/java/org/apache/janus/authentication/realm/Table.java (original) +++ incubator/directory/janus/trunk/jdbc/src/java/org/apache/authx/authentication/realm/Table.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; import java.util.Collection; import java.util.Collections; Modified: incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Columns.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Columns.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/Columns.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Columns.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/Columns.java (original) +++ incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Columns.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; public class Columns { Modified: incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Creds.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Creds.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/Creds.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Creds.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/Creds.java (original) +++ incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Creds.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; -import org.apache.janus.authentication.Credential; +import org.apache.authx.authentication.CredentialSet; +import org.apache.authx.authentication.Credential; public class Creds { Modified: incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/JDBCRealmTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/JDBCRealmTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/JDBCRealmTest.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/JDBCRealmTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/JDBCRealmTest.java (original) +++ incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/JDBCRealmTest.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; import junit.framework.TestCase; Modified: incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/JDBCSelectorTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/JDBCSelectorTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/JDBCSelectorTest.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/JDBCSelectorTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/JDBCSelectorTest.java (original) +++ incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/JDBCSelectorTest.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; import junit.framework.TestCase; Modified: incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/MemoryDatabase.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/MemoryDatabase.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/MemoryDatabase.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/MemoryDatabase.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/MemoryDatabase.java (original) +++ incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/MemoryDatabase.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.Credential; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.Credential; +import org.apache.authx.authentication.CredentialSet; import org.hsqldb.DatabaseManager; import org.hsqldb.jdbc.jdbcDataSource; Modified: incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/SameCredentialsBuilderTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/SameCredentialsBuilderTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/SameCredentialsBuilderTest.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/SameCredentialsBuilderTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/SameCredentialsBuilderTest.java (original) +++ incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/SameCredentialsBuilderTest.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; -import org.apache.janus.authentication.CredentialSet; +import org.apache.authx.authentication.CredentialSet; import org.jmock.Mock; import org.jmock.MockObjectTestCase; Modified: incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Tables.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Tables.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/Tables.java&r1=124867&p2=incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Tables.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/jdbc/src/test/org/apache/janus/authentication/realm/Tables.java (original) +++ incubator/directory/janus/trunk/jdbc/src/test/org/apache/authx/authentication/realm/Tables.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.authentication.realm; +package org.apache.authx.authentication.realm; public class Tables { Modified: incubator/directory/janus/trunk/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/project.xml?view=diff&rev=124872&p1=incubator/directory/janus/trunk/project.xml&r1=124871&p2=incubator/directory/janus/trunk/project.xml&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/project.xml (original) +++ incubator/directory/janus/trunk/project.xml Mon Jan 10 20:25:46 2005 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <project> <groupId>incubator-directory</groupId> - <artifactId>janus</artifactId> + <artifactId>authx</artifactId> <currentVersion>0.1-SNAPSHOT</currentVersion> - <name>Janus</name> - <package>org.apache.janus</package> - <shortDescription>Janus Authentication, Authorization and Accounting Framework</shortDescription> + <name>Apache Authentication and Authorization Framework</name> + <package>org.apache.authx</package> + <shortDescription>Apache Authentication and Authorization Framework</shortDescription> <description> - The Janus subproject attempts to provide a generic, flexible and extensible security - framework to the Directory project. It provides Authentication, Authorization and Accounting - facilities. The framework is designed around a pluggable architecture to give greater flexibility + The Apache Authentication and Authorization Framework subproject attempts to provide a generic, + flexible and extensible security framework to the Directory project. It provides Authentication, Authorization + and Accounting facilities. The framework is designed around a pluggable architecture to give greater flexibility and leverage existing AAA insfrastructures. </description> <inceptionYear>2003</inceptionYear> Modified: incubator/directory/janus/trunk/sandbox/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/sandbox/project.xml?view=diff&rev=124872&p1=incubator/directory/janus/trunk/sandbox/project.xml&r1=124871&p2=incubator/directory/janus/trunk/sandbox/project.xml&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/sandbox/project.xml (original) +++ incubator/directory/janus/trunk/sandbox/project.xml Mon Jan 10 20:25:46 2005 @@ -2,11 +2,11 @@ <project> <extend>${basedir}/../project.xml</extend> - <name>Janus Sandbox</name> - <id>janus-sandbox</id> - <package>org.apache.janus</package> + <name>Apache Authentication and Authorization Framework Sandbox</name> + <id>authx-sandbox</id> + <package>org.apache.authx</package> - <shortDescription>Janus Sandbox Space</shortDescription> + <shortDescription>Apache Authentication and Authorization Framework Sandbox Space</shortDescription> <description> A playground for all sorts of ideas @@ -15,13 +15,13 @@ <dependencies> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>janus-api</artifactId> + <artifactId>authx-api</artifactId> <version>${pom.currentVersion}</version> </dependency> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>janus-impl</artifactId> + <artifactId>authx-impl</artifactId> <version>${pom.currentVersion}</version> </dependency> Modified: incubator/directory/janus/trunk/script/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/project.xml?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/project.xml&r1=124871&p2=incubator/directory/janus/trunk/script/project.xml&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/project.xml (original) +++ incubator/directory/janus/trunk/script/project.xml Mon Jan 10 20:25:46 2005 @@ -2,25 +2,25 @@ <project> <extend>${basedir}/../project.xml</extend> - <name>Janus scripted front-end</name> - <id>janus-script</id> - <package>org.apache.janus.script</package> + <name>Apache Authentication and Authorization Framework scripted front-end</name> + <id>authx-script</id> + <package>org.apache.authx.script</package> - <shortDescription>Scripted front-end to Janus</shortDescription> + <shortDescription>Scripted front-end to Apache Authentication and Authorization Framework</shortDescription> <description> - Scripted front-end to Janus + Scripted front-end to Apache Authentication and Authorization Framework </description> <dependencies> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>janus-api</artifactId> + <artifactId>authx-api</artifactId> <version>${pom.currentVersion}</version> </dependency> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>janus-impl</artifactId> + <artifactId>authx-impl</artifactId> <version>${pom.currentVersion}</version> </dependency> Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/InformationProviderBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/InformationProviderBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/InformationProviderBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/InformationProviderBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/InformationProviderBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/InformationProviderBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.script; +package org.apache.authx.script; -import org.apache.janus.authentication.attribute.MutableInformationProvider; -import org.apache.janus.authentication.attribute.MutableInformationProvider; +import org.apache.authx.authentication.attribute.MutableInformationProvider; +import org.apache.authx.authentication.attribute.MutableInformationProvider; public interface InformationProviderBuilder { Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/InformationProviderBuilderMonitor.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/InformationProviderBuilderMonitor.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/InformationProviderBuilderMonitor.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/InformationProviderBuilderMonitor.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/InformationProviderBuilderMonitor.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/InformationProviderBuilderMonitor.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script; +package org.apache.authx.script; -import org.apache.janus.authentication.attribute.CyclicAssociationException; +import org.apache.authx.authentication.attribute.CyclicAssociationException; import java.security.Principal; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/NullInformationProviderMonitor.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/NullInformationProviderMonitor.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/NullInformationProviderMonitor.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/NullInformationProviderMonitor.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/NullInformationProviderMonitor.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/NullInformationProviderMonitor.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script; +package org.apache.authx.script; -import org.apache.janus.authentication.attribute.CyclicAssociationException; +import org.apache.authx.authentication.attribute.CyclicAssociationException; import java.security.Principal; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/NullRealmBuilderMonitor.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/NullRealmBuilderMonitor.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/NullRealmBuilderMonitor.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/NullRealmBuilderMonitor.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/NullRealmBuilderMonitor.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/NullRealmBuilderMonitor.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script; +package org.apache.authx.script; -import org.apache.janus.authentication.realm.IdentityInUseException; +import org.apache.authx.authentication.realm.IdentityInUseException; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RealmBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RealmBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/RealmBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RealmBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/RealmBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RealmBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script; +package org.apache.authx.script; -import org.apache.janus.authentication.realm.MutableRealm; +import org.apache.authx.authentication.realm.MutableRealm; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RealmBuilderMonitor.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RealmBuilderMonitor.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/RealmBuilderMonitor.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RealmBuilderMonitor.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/RealmBuilderMonitor.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RealmBuilderMonitor.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script; +package org.apache.authx.script; -import org.apache.janus.authentication.realm.IdentityInUseException; +import org.apache.authx.authentication.realm.IdentityInUseException; /** * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RuleSetBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RuleSetBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/RuleSetBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RuleSetBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/RuleSetBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/RuleSetBuilder.java Mon Jan 10 20:25:46 2005 @@ -1,6 +1,6 @@ -package org.apache.janus.script; +package org.apache.authx.script; -import org.apache.janus.authorization.RuleSet; +import org.apache.authx.authorization.RuleSet; public interface RuleSetBuilder { Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/ScriptInterpretationException.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/ScriptInterpretationException.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/ScriptInterpretationException.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/ScriptInterpretationException.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/ScriptInterpretationException.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/ScriptInterpretationException.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.script; +package org.apache.authx.script; public class ScriptInterpretationException extends ScriptingException { Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/ScriptingException.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/ScriptingException.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/ScriptingException.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/ScriptingException.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/ScriptingException.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/ScriptingException.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script; +package org.apache.authx.script; -import org.apache.janus.JanusException; +import org.apache.authx.JanusException; public class ScriptingException extends JanusException { Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/AbstractDom4JInformationProviderBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/AbstractDom4JInformationProviderBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/AbstractDom4JInformationProviderBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/AbstractDom4JInformationProviderBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/AbstractDom4JInformationProviderBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/AbstractDom4JInformationProviderBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,15 +14,15 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; -import org.apache.janus.authentication.attribute.MutableInformationProvider; -import org.apache.janus.authentication.attribute.GroupPrincipal; -import org.apache.janus.authentication.attribute.MutableInformationProvider; -import org.apache.janus.authentication.attribute.CyclicAssociationException; -import org.apache.janus.authentication.realm.UsernamePrincipal; -import org.apache.janus.script.InformationProviderBuilderMonitor; -import org.apache.janus.script.InformationProviderBuilder; +import org.apache.authx.authentication.attribute.MutableInformationProvider; +import org.apache.authx.authentication.attribute.GroupPrincipal; +import org.apache.authx.authentication.attribute.MutableInformationProvider; +import org.apache.authx.authentication.attribute.CyclicAssociationException; +import org.apache.authx.authentication.realm.UsernamePrincipal; +import org.apache.authx.script.InformationProviderBuilderMonitor; +import org.apache.authx.script.InformationProviderBuilder; import org.dom4j.Element; import java.security.Principal; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/BuildingContext.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/BuildingContext.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/BuildingContext.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/BuildingContext.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/BuildingContext.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/BuildingContext.java Mon Jan 10 20:25:46 2005 @@ -1,4 +1,4 @@ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; public interface BuildingContext extends ElementBuilder { Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JGroupBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JGroupBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JGroupBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JGroupBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JGroupBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JGroupBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,12 +14,12 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; -import org.apache.janus.authentication.attribute.GroupPrincipal; -import org.apache.janus.authentication.attribute.MutableInformationProvider; -import org.apache.janus.script.InformationProviderBuilderMonitor; -import org.apache.janus.script.NullInformationProviderMonitor; +import org.apache.authx.authentication.attribute.GroupPrincipal; +import org.apache.authx.authentication.attribute.MutableInformationProvider; +import org.apache.authx.script.InformationProviderBuilderMonitor; +import org.apache.authx.script.NullInformationProviderMonitor; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRealmBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRealmBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JRealmBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRealmBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JRealmBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRealmBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,16 +14,16 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; -import org.apache.janus.authentication.CredentialSet; -import org.apache.janus.authentication.realm.IdentityInUseException; -import org.apache.janus.authentication.realm.MutableRealm; -import org.apache.janus.authentication.realm.PasswordCredential; -import org.apache.janus.authentication.realm.UsernameCredential; -import org.apache.janus.script.NullRealmBuilderMonitor; -import org.apache.janus.script.RealmBuilder; -import org.apache.janus.script.RealmBuilderMonitor; +import org.apache.authx.authentication.CredentialSet; +import org.apache.authx.authentication.realm.IdentityInUseException; +import org.apache.authx.authentication.realm.MutableRealm; +import org.apache.authx.authentication.realm.PasswordCredential; +import org.apache.authx.authentication.realm.UsernameCredential; +import org.apache.authx.script.NullRealmBuilderMonitor; +import org.apache.authx.script.RealmBuilder; +import org.apache.authx.script.RealmBuilderMonitor; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRoleBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRoleBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JRoleBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRoleBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JRoleBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRoleBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,12 +14,12 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; -import org.apache.janus.authentication.attribute.MutableInformationProvider; -import org.apache.janus.authentication.attribute.RolePrincipal; -import org.apache.janus.script.InformationProviderBuilderMonitor; -import org.apache.janus.script.NullInformationProviderMonitor; +import org.apache.authx.authentication.attribute.MutableInformationProvider; +import org.apache.authx.authentication.attribute.RolePrincipal; +import org.apache.authx.script.InformationProviderBuilderMonitor; +import org.apache.authx.script.NullInformationProviderMonitor; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRuleSetBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRuleSetBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JRuleSetBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRuleSetBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JRuleSetBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JRuleSetBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,20 +14,20 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; -import org.apache.janus.authorization.Rule; -import org.apache.janus.authorization.RuleSet; -import org.apache.janus.script.RuleSetBuilder; -import org.apache.janus.script.xml.builder.HasUsernamePredicateBuilder; -import org.apache.janus.script.xml.builder.TruePredicateBuilder; -import org.apache.janus.script.xml.builder.FalsePredicateBuilder; -import org.apache.janus.script.xml.builder.HasGroupPredicateBuilder; -import org.apache.janus.script.xml.builder.HasRolePredicateBuilder; -import org.apache.janus.script.xml.builder.AndPredicateBuilder; -import org.apache.janus.script.xml.builder.OrPredicateBuilder; -import org.apache.janus.script.xml.builder.GrantRuleBuilder; -import org.apache.janus.script.xml.builder.DenyRuleBuilder; +import org.apache.authx.authorization.Rule; +import org.apache.authx.authorization.RuleSet; +import org.apache.authx.script.RuleSetBuilder; +import org.apache.authx.script.xml.builder.HasUsernamePredicateBuilder; +import org.apache.authx.script.xml.builder.TruePredicateBuilder; +import org.apache.authx.script.xml.builder.FalsePredicateBuilder; +import org.apache.authx.script.xml.builder.HasGroupPredicateBuilder; +import org.apache.authx.script.xml.builder.HasRolePredicateBuilder; +import org.apache.authx.script.xml.builder.AndPredicateBuilder; +import org.apache.authx.script.xml.builder.OrPredicateBuilder; +import org.apache.authx.script.xml.builder.GrantRuleBuilder; +import org.apache.authx.script.xml.builder.DenyRuleBuilder; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JUtils.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JUtils.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JUtils.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JUtils.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JUtils.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/Dom4JUtils.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; import org.dom4j.Document; import org.dom4j.DocumentException; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/ElementBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/ElementBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/ElementBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/ElementBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/ElementBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/ElementBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; import org.dom4j.Element; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/ReverseBuildingContext.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/ReverseBuildingContext.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/ReverseBuildingContext.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/ReverseBuildingContext.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/ReverseBuildingContext.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/ReverseBuildingContext.java Mon Jan 10 20:25:46 2005 @@ -14,11 +14,11 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; import org.dom4j.Element; -import org.apache.janus.script.ScriptInterpretationException; -import org.apache.janus.script.xml.builder.AbstractElementBuilder; +import org.apache.authx.script.ScriptInterpretationException; +import org.apache.authx.script.xml.builder.AbstractElementBuilder; import java.util.List; import java.util.ArrayList; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AbstractElementBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AbstractElementBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/AbstractElementBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AbstractElementBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/AbstractElementBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AbstractElementBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; -import org.apache.janus.script.xml.ElementBuilder; +import org.apache.authx.script.xml.ElementBuilder; public abstract class AbstractElementBuilder implements ElementBuilder { Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AbstractRuleBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AbstractRuleBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/AbstractRuleBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AbstractRuleBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/AbstractRuleBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AbstractRuleBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,11 +14,11 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; -import org.apache.janus.authorization.DefaultRule; -import org.apache.janus.authorization.Effect; -import org.apache.janus.authorization.Predicate; +import org.apache.authx.authorization.DefaultRule; +import org.apache.authx.authorization.Effect; +import org.apache.authx.authorization.Predicate; import org.dom4j.Element; import java.util.Iterator; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AndPredicateBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AndPredicateBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/AndPredicateBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AndPredicateBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/AndPredicateBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/AndPredicateBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,11 +14,11 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; -import org.apache.janus.authorization.Predicate; -import org.apache.janus.authorization.predicate.AndPredicate; -import org.apache.janus.authorization.predicate.Predicates; +import org.apache.authx.authorization.Predicate; +import org.apache.authx.authorization.predicate.AndPredicate; +import org.apache.authx.authorization.predicate.Predicates; public class AndPredicateBuilder extends LogicalPredicateBuilder Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/DenyRuleBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/DenyRuleBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/DenyRuleBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/DenyRuleBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/DenyRuleBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/DenyRuleBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; -import org.apache.janus.authorization.effect.Effects; +import org.apache.authx.authorization.effect.Effects; public class DenyRuleBuilder extends AbstractRuleBuilder { Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/FalsePredicateBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/FalsePredicateBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/FalsePredicateBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/FalsePredicateBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/FalsePredicateBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/FalsePredicateBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; -import org.apache.janus.authorization.predicate.Predicates; +import org.apache.authx.authorization.predicate.Predicates; import org.dom4j.Element; public class FalsePredicateBuilder extends AbstractElementBuilder Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/GrantRuleBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/GrantRuleBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/GrantRuleBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/GrantRuleBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/GrantRuleBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/GrantRuleBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; -import org.apache.janus.authorization.effect.Effects; +import org.apache.authx.authorization.effect.Effects; public class GrantRuleBuilder extends AbstractRuleBuilder { Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasGroupPredicateBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasGroupPredicateBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/HasGroupPredicateBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasGroupPredicateBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/HasGroupPredicateBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasGroupPredicateBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; -import org.apache.janus.authentication.attribute.GroupPrincipal; -import org.apache.janus.authorization.predicate.HasPrincipalPredicate; +import org.apache.authx.authentication.attribute.GroupPrincipal; +import org.apache.authx.authorization.predicate.HasPrincipalPredicate; import org.dom4j.Element; public class HasGroupPredicateBuilder extends AbstractElementBuilder Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasRolePredicateBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasRolePredicateBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/HasRolePredicateBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasRolePredicateBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/HasRolePredicateBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasRolePredicateBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; -import org.apache.janus.authentication.attribute.RolePrincipal; -import org.apache.janus.authorization.predicate.HasPrincipalPredicate; +import org.apache.authx.authentication.attribute.RolePrincipal; +import org.apache.authx.authorization.predicate.HasPrincipalPredicate; import org.dom4j.Element; public class HasRolePredicateBuilder extends AbstractElementBuilder Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasUsernamePredicateBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasUsernamePredicateBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/HasUsernamePredicateBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasUsernamePredicateBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/HasUsernamePredicateBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/HasUsernamePredicateBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; -import org.apache.janus.authentication.realm.UsernamePrincipal; -import org.apache.janus.authorization.predicate.HasPrincipalPredicate; +import org.apache.authx.authentication.realm.UsernamePrincipal; +import org.apache.authx.authorization.predicate.HasPrincipalPredicate; import org.dom4j.Element; public class HasUsernamePredicateBuilder extends AbstractElementBuilder Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/LogicalPredicateBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/LogicalPredicateBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/LogicalPredicateBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/LogicalPredicateBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/LogicalPredicateBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/LogicalPredicateBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,12 +14,12 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; import org.dom4j.Element; -import org.apache.janus.authorization.Predicate; -import org.apache.janus.authorization.predicate.Predicates; -import org.apache.janus.authorization.predicate.AndPredicate; +import org.apache.authx.authorization.Predicate; +import org.apache.authx.authorization.predicate.Predicates; +import org.apache.authx.authorization.predicate.AndPredicate; import java.util.Iterator; Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/OrPredicateBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/OrPredicateBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/OrPredicateBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/OrPredicateBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/OrPredicateBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/OrPredicateBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,11 +14,11 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; -import org.apache.janus.authorization.Predicate; -import org.apache.janus.authorization.predicate.OrPredicate; -import org.apache.janus.authorization.predicate.Predicates; +import org.apache.authx.authorization.Predicate; +import org.apache.authx.authorization.predicate.OrPredicate; +import org.apache.authx.authorization.predicate.Predicates; public class OrPredicateBuilder extends LogicalPredicateBuilder { Modified: incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/TruePredicateBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/TruePredicateBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/TruePredicateBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/TruePredicateBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/builder/TruePredicateBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/java/org/apache/authx/script/xml/builder/TruePredicateBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script.xml.builder; +package org.apache.authx.script.xml.builder; -import org.apache.janus.authorization.predicate.Predicates; +import org.apache.authx.authorization.predicate.Predicates; import org.dom4j.Element; public class TruePredicateBuilder extends AbstractElementBuilder Modified: incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/EyeColorPrincipal.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/EyeColorPrincipal.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/EyeColorPrincipal.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/EyeColorPrincipal.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/EyeColorPrincipal.java (original) +++ incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/EyeColorPrincipal.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script.testmodel; +package org.apache.authx.script.testmodel; -import org.apache.janus.authentication.AbstractPrincipal; +import org.apache.authx.authentication.AbstractPrincipal; public class EyeColorPrincipal extends AbstractPrincipal { Modified: incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Groups.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Groups.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/Groups.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Groups.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/Groups.java (original) +++ incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Groups.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script.testmodel; +package org.apache.authx.script.testmodel; -import org.apache.janus.authentication.attribute.GroupPrincipal; +import org.apache.authx.authentication.attribute.GroupPrincipal; public class Groups { Modified: incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Permissions.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Permissions.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/Permissions.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Permissions.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/Permissions.java (original) +++ incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Permissions.java Mon Jan 10 20:25:46 2005 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.janus.script.testmodel; +package org.apache.authx.script.testmodel; -import org.apache.janus.authorization.BasicPermission; -import org.apache.janus.authorization.Permission; +import org.apache.authx.authorization.BasicPermission; +import org.apache.authx.authorization.Permission; public class Permissions { Modified: incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Roles.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Roles.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/Roles.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Roles.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/Roles.java (original) +++ incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Roles.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script.testmodel; +package org.apache.authx.script.testmodel; -import org.apache.janus.authentication.attribute.RolePrincipal; +import org.apache.authx.authentication.attribute.RolePrincipal; import java.security.Principal; Modified: incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Subjects.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Subjects.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/Subjects.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Subjects.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/Subjects.java (original) +++ incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Subjects.java Mon Jan 10 20:25:46 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.janus.script.testmodel; +package org.apache.authx.script.testmodel; import javax.security.auth.Subject; import java.security.Principal; Modified: incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Usernames.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Usernames.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/Usernames.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Usernames.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/testmodel/Usernames.java (original) +++ incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/testmodel/Usernames.java Mon Jan 10 20:25:46 2005 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.janus.script.testmodel; +package org.apache.authx.script.testmodel; -import org.apache.janus.authentication.realm.UsernamePrincipal; +import org.apache.authx.authentication.realm.UsernamePrincipal; public class Usernames { Modified: incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JGroupBuilderTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JGroupBuilderTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JGroupBuilderTest.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JGroupBuilderTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JGroupBuilderTest.java (original) +++ incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JGroupBuilderTest.java Mon Jan 10 20:25:46 2005 @@ -14,14 +14,14 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; -import org.apache.janus.authentication.attribute.AttributeProvider; -import org.apache.janus.authentication.attribute.CyclicAssociationException; -import org.apache.janus.authentication.attribute.MutableInformationProvider; -import org.apache.janus.script.InformationProviderBuilderMonitor; -import org.apache.janus.script.testmodel.Groups; -import org.apache.janus.script.testmodel.Usernames; +import org.apache.authx.authentication.attribute.AttributeProvider; +import org.apache.authx.authentication.attribute.CyclicAssociationException; +import org.apache.authx.authentication.attribute.MutableInformationProvider; +import org.apache.authx.script.InformationProviderBuilderMonitor; +import org.apache.authx.script.testmodel.Groups; +import org.apache.authx.script.testmodel.Usernames; import org.jmock.Mock; import org.jmock.MockObjectTestCase; import org.jmock.core.Constraint; Modified: incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRealmBuilderTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRealmBuilderTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JRealmBuilderTest.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRealmBuilderTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JRealmBuilderTest.java (original) +++ incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRealmBuilderTest.java Mon Jan 10 20:25:46 2005 @@ -14,15 +14,15 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; -import org.apache.janus.authentication.CredentialSet; -import org.apache.janus.authentication.realm.MemoryRealm; -import org.apache.janus.authentication.realm.MutableRealm; -import org.apache.janus.authentication.realm.PasswordCredential; -import org.apache.janus.authentication.realm.UsernameCredential; -import org.apache.janus.authentication.realm.UsernamePasswordAuthentication; -import org.apache.janus.script.RealmBuilderMonitor; +import org.apache.authx.authentication.CredentialSet; +import org.apache.authx.authentication.realm.MemoryRealm; +import org.apache.authx.authentication.realm.MutableRealm; +import org.apache.authx.authentication.realm.PasswordCredential; +import org.apache.authx.authentication.realm.UsernameCredential; +import org.apache.authx.authentication.realm.UsernamePasswordAuthentication; +import org.apache.authx.script.RealmBuilderMonitor; import org.jmock.Mock; import org.jmock.MockObjectTestCase; Modified: incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRoleBuilderTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRoleBuilderTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JRoleBuilderTest.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRoleBuilderTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JRoleBuilderTest.java (original) +++ incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRoleBuilderTest.java Mon Jan 10 20:25:46 2005 @@ -14,12 +14,12 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; -import org.apache.janus.authentication.attribute.MutableInformationProvider; -import org.apache.janus.script.testmodel.Groups; -import org.apache.janus.script.testmodel.Roles; -import org.apache.janus.script.testmodel.Usernames; +import org.apache.authx.authentication.attribute.MutableInformationProvider; +import org.apache.authx.script.testmodel.Groups; +import org.apache.authx.script.testmodel.Roles; +import org.apache.authx.script.testmodel.Usernames; import org.jmock.Mock; import org.jmock.MockObjectTestCase; Modified: incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRuleSetBuilderTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRuleSetBuilderTest.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JRuleSetBuilderTest.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRuleSetBuilderTest.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JRuleSetBuilderTest.java (original) +++ incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/Dom4JRuleSetBuilderTest.java Mon Jan 10 20:25:46 2005 @@ -14,19 +14,19 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; import junit.framework.TestCase; -import org.apache.janus.authorization.Policy; -import org.apache.janus.authorization.effect.DenyOverridesEffect; -import org.apache.janus.authorization.effect.Effects; -import org.apache.janus.authorization.effect.PermitOverridesEffect; -import org.apache.janus.script.testmodel.Groups; -import org.apache.janus.script.testmodel.Permissions; -import org.apache.janus.script.testmodel.Roles; -import org.apache.janus.script.testmodel.Subjects; -import org.apache.janus.script.testmodel.Usernames; -import org.apache.janus.script.xml.builder.FalsePredicateBuilder; +import org.apache.authx.authorization.Policy; +import org.apache.authx.authorization.effect.DenyOverridesEffect; +import org.apache.authx.authorization.effect.Effects; +import org.apache.authx.authorization.effect.PermitOverridesEffect; +import org.apache.authx.script.testmodel.Groups; +import org.apache.authx.script.testmodel.Permissions; +import org.apache.authx.script.testmodel.Roles; +import org.apache.authx.script.testmodel.Subjects; +import org.apache.authx.script.testmodel.Usernames; +import org.apache.authx.script.xml.builder.FalsePredicateBuilder; import java.io.StringReader; Modified: incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/HasEyeColorPredicateBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/HasEyeColorPredicateBuilder.java?view=diff&rev=124872&p1=incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/HasEyeColorPredicateBuilder.java&r1=124867&p2=incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/HasEyeColorPredicateBuilder.java&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/HasEyeColorPredicateBuilder.java (original) +++ incubator/directory/janus/trunk/script/src/test/org/apache/authx/script/xml/HasEyeColorPredicateBuilder.java Mon Jan 10 20:25:46 2005 @@ -14,11 +14,11 @@ * limitations under the License. * */ -package org.apache.janus.script.xml; +package org.apache.authx.script.xml; -import org.apache.janus.authorization.predicate.HasPrincipalPredicate; -import org.apache.janus.script.testmodel.EyeColorPrincipal; -import org.apache.janus.script.xml.builder.AbstractElementBuilder; +import org.apache.authx.authorization.predicate.HasPrincipalPredicate; +import org.apache.authx.script.testmodel.EyeColorPrincipal; +import org.apache.authx.script.xml.builder.AbstractElementBuilder; import org.dom4j.Element; public class HasEyeColorPredicateBuilder extends AbstractElementBuilder Modified: incubator/directory/janus/trunk/xdocs/index.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/xdocs/index.xml?view=diff&rev=124872&p1=incubator/directory/janus/trunk/xdocs/index.xml&r1=124871&p2=incubator/directory/janus/trunk/xdocs/index.xml&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/xdocs/index.xml (original) +++ incubator/directory/janus/trunk/xdocs/index.xml Mon Jan 10 20:25:46 2005 @@ -8,30 +8,31 @@ <body> <section name="Introduction"> <p> - Janus is an effort to develop an Authentication, Authorization and Accounting framework for - building security infrastructures. + The Apache Authentication and Authorization Framework (AuthX) is an effort to develop an + Authentication, Authorization and Accounting framework for building security infrastructures. </p> </section> <section name="Vision"> <p> - Janus is an attempt to provide a framework for developing complex security infrastructures. - It addresses the Authentication, Authorization and Accounting concerns of secure applications or systems. + AuthX is an attempt to provide a framework for developing complex + security infrastructures. It addresses the Authentication, Authorization and Accounting concerns of secure + applications or systems. </p> <p> - Janus tries to define proper abstractions for security concepts to be a generic and flexible security framework + AuthX tries to define proper abstractions for security concepts to be a generic and flexible security framework on top of which complex secure applications can be built. It does not deal with cryptography mechanisms, - since cryptography is a mean of attaining security goals. Yet, since Janus has been thought to be flexible, - it is easy to plug-in your own implementations of Janus abstractions. + since cryptography is a mean of attaining security goals. Yet, since the framework has been thought to be flexible, + it is easy to plug-in your own implementations of AuthX abstractions. </p> </section> <section name="Features"> <p> - The Janus sub-project defines the Janus security framework and provides default implementations of authentication, - authorization and accounting components. + The AuthX sub-project defines the Apache Authentication and Authorization Framework security framework + and provides default implementations of authentication,authorization and accounting components. - We believe Janus has some unique features that set it apart from existing solutions: + We believe AuthX has some unique features that set it apart from existing solutions: <ul> <li>Plain Java Object framework</li> <li>Core has no dependency</li> Modified: incubator/directory/janus/trunk/xdocs/navigation.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/xdocs/navigation.xml?view=diff&rev=124872&p1=incubator/directory/janus/trunk/xdocs/navigation.xml&r1=124871&p2=incubator/directory/janus/trunk/xdocs/navigation.xml&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/xdocs/navigation.xml (original) +++ incubator/directory/janus/trunk/xdocs/navigation.xml Mon Jan 10 20:25:46 2005 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project> - <title>Janus</title> + <title>AuthX</title> <body> <links> @@ -14,7 +14,7 @@ <item name="ApSeda" href="../apseda/index.html"/> </links> - <menu name="Janus"> + <menu name="AuthX"> <item name="Overview" href="/index.html"/> <item name="News and Status" href="/news.html"/> <item name="Roadmap" href="/roadmap.html"/> Modified: incubator/directory/janus/trunk/xdocs/news.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/xdocs/news.xml?view=diff&rev=124872&p1=incubator/directory/janus/trunk/xdocs/news.xml&r1=124871&p2=incubator/directory/janus/trunk/xdocs/news.xml&r2=124872 ============================================================================== --- incubator/directory/janus/trunk/xdocs/news.xml (original) +++ incubator/directory/janus/trunk/xdocs/news.xml Mon Jan 10 20:25:46 2005 @@ -12,19 +12,19 @@ <subsection name="16 December 2004"> <p> - A lot has happened under the hood since this summer and we're nearing a first release. - The goal of this first release is to demonstrate usage of the framework. - </p> - <p> - The authentication subsystem has matured and a new rule based authorization mechanism - replaces the old role based only one. Memory implementations are provided with XML - frontends for realms, information providers and policies. A proof of concept of a JDBC - backend is also available for security realms. - </p> - <p> - See the <a href="./roadmap.html">roadmap</a> for details of what to expect next. + A lot has happened under the hood since this summer and we're nearing a first release. + The goal of this first release is to demonstrate usage of the framework. </p> - </subsection> + <p> + The authentication subsystem has matured and a new rule based authorization mechanism + replaces the old role based only one. Memory implementations are provided with XML + frontends for realms, information providers and policies. A proof of concept of a JDBC + backend is also available for security realms. + </p> + <p> + See the <a href="./roadmap.html">roadmap</a> for details of what to expect next. + </p> + </subsection> <subsection name="01 July 2004"> <p> @@ -35,7 +35,7 @@ <subsection name="15 June 2004"> <p> - Work has begun in the Janus sandbox to rewrite the authorization stuff. + Work has begun in the the sandbox to rewrite the authorization stuff. Directions can be found on the <a href="http://wiki.apache.org/directory/JanusHome";>Wiki</a>. </p> </subsection> @@ -53,7 +53,7 @@ <subsection name="Authorization"> <p> - The whole authorization mechanism is being rewritten in Janus sandbox with a rule-based approach. + The whole authorization mechanism is being rewritten in the sandbox with a rule-based approach. We believe this will give us great flexibility to implement a broad range of security policy requirements. </p> </subsection>
